rMalie
|
f2b5ee338b
|
// Merge -> revision 7875
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-03 16:16:49 +00:00 |
|
rMalie
|
ffeb22bfb9
|
// Merge with revision 7841
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 11:43:58 +00:00 |
|
rMalie
|
c945049ef1
|
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-02 09:54:23 +00:00 |
|
tDidierjean
|
d3b2ff2664
|
// Context part 25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7794 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:17:58 +00:00 |
|
rMalie
|
a1a32714ab
|
// Fix #PSFV-30 + context part 24
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 14:12:17 +00:00 |
|
rMalie
|
a875fecb20
|
// MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 09:20:57 +00:00 |
|
rMalie
|
be4811aa6e
|
// REVERT MERGE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 13:35:06 +00:00 |
|
rMalie
|
e159c925d8
|
// MERGE with trunk revision 7754
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 12:48:42 +00:00 |
|
rMalie
|
3557765c59
|
// Fix #PSFV-25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7752 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:36:23 +00:00 |
|
rMalie
|
dd5109b3f5
|
// Fix adminMeta page + bug #PSFV-39
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7745 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-27 08:03:00 +00:00 |
|
tDidierjean
|
fddc7a6a75
|
// fix missing context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7738 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-26 14:55:04 +00:00 |
|
rMalie
|
e62be3d793
|
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-22 08:57:51 +00:00 |
|
rMalie
|
e921117581
|
// Add config/alias.php file + refactoring of DB / MySQL classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 16:10:12 +00:00 |
|
rMalie
|
42da42f827
|
// Context part 16 (shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7664 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-20 12:08:15 +00:00 |
|
tDidierjean
|
89213e18e5
|
// Context part 12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 09:28:11 +00:00 |
|
rMalie
|
7b8f139103
|
// Context part 10
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7642 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 15:27:32 +00:00 |
|
tDidierjean
|
0dbcebf01e
|
// Context part 9
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7637 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 10:08:07 +00:00 |
|
tDidierjean
|
e5c68ba9ae
|
// Context part 5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7624 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 15:24:38 +00:00 |
|
rMalie
|
10dd3db8d4
|
// Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 16:28:20 +00:00 |
|
tDidierjean
|
25b1bceffd
|
// Context part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 12:50:00 +00:00 |
|
rMalie
|
3c50152c94
|
// Some fix + multistore for import tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7546 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-07 12:18:27 +00:00 |
|
rGaillard
|
3dde6382a5
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7528 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 13:26:34 +00:00 |
|
rGaillard
|
8a59d0dc41
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
69f2f09dc5
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:10:43 +00:00 |
|
tDidierjean
|
38cf360a0b
|
// merge 6001,6010,6012,6013
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6018 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-21 08:01:09 +00:00 |
|
rGaillard
|
3d547dcae3
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6009 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-20 15:02:16 +00:00 |
|
tDidierjean
|
8c520c66a3
|
[-] BO : fixed bug #PSCFI-1429 - Deleting products does not remove image files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5913 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-15 10:10:23 +00:00 |
|
rGaillard
|
ccbf26dd75
|
[-] BO : Fixed #1205 error on updating product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5885 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-13 09:04:32 +00:00 |
|
aFolletete
|
10445ad61d
|
// 1.5 branche creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-12 18:24:40 +00:00 |
|