dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169 Commits 9 Branches 19 Tags
f2b5ee338b6c19aaf65cea06fc2dbb1821f9ea3e
Commit Graph

37 Commits

Author SHA1 Message Date
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 6fc10e23f8 // Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 14:24:28 +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 72de3384a7 // Fix #PSFV-12 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7795 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:38:46 +00:00
rMalie 8bfd44085d // Some fix after merge 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:03:43 +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
tDidierjean 9e349dd274 // Context part 18 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7723 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 15:19:39 +00:00
rMalie 6814ae87c6 // Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7716 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 10:32:56 +00:00
tDidierjean e72ae93557 // Context part 17 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7688 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 09:35:28 +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
tDidierjean 9619b93c73 // fix delete customization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7681 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-21 16:41:12 +00:00
tDidierjean 462c362191 // removing cookie from product customization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7680 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-21 14:38:04 +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
rMalie 4ae81d8acd // Context part 15 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7658 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 16:17:14 +00:00
tDidierjean e91c92ce98 // Context part 14 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7653 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 12:28:30 +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 311e8ab964 // Context part 8 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7633 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-15 16:41:39 +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 67c80b2b42 // Refactoring of shop class with new context Part 2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-13 12:52:09 +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
rMalie 50f9794383 // Context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7600 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-12 13:50:15 +00:00
tDidierjean 143022e488 // Context - first commit 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-11 14:32:05 +00:00
tDidierjean 8bf1b23239 // revert previous commit 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-08 16:12:27 +00:00
tDidierjean f085f81d23 // cancel commit 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-08 15:43:24 +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
fBrignoli 4a210f98d9 [+] Dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-06-15 16:32:06 +00:00
fBrignoli 56099fa735 // merge 1.4 => 6117 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-29 09:09:38 +00:00
aNiassy e185dcbe01 [-] FO : #PSCFI-1660 Fixed a bug which not display an error when a carrier is not selected 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6081 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-27 15:41:23 +00:00
aNiassy b32dc579cf [-] FO : #PSCFI-1654 Fixed a bug concerning the order process after a login 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6075 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-27 13:45:27 +00:00
gBrunier e772df0473 [-] FO : Fixed bug #PSCFI-1652 - The Best Sales pagination now works properly 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6068 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-26 10:17:35 +00:00
fBrignoli 43b6a41bbc // merge 1.4 (5397) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-22 16:00:58 +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