Commit Graph

38 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
6f08bcb12e [+] Add a route system to personalize rewrited URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7876 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:02: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
ab5fc723b4 // Routes for dispatcher (part 4) + some fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-01 13:28:02 +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
4ade3a0ea0 // remove 1.4 deprecated functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7755 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 09:51:43 +00:00
tDidierjean
d05d16d399 // Context part 21
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 16:40:17 +00:00
tDidierjean
51b4c8591d // Context part 20
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7740 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 15:55:04 +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
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
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
rMalie
3baf0f02a5 // Fix minor bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7656 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 14:10:44 +00:00
rMalie
35e5efb530 // Context part 13
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:44:10 +00:00
rMalie
8a0a62ae03 // Context in modules + Shop::sql* methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:23:10 +00:00
rMalie
0452f08f64 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7643 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-18 15:37:31 +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
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
tDidierjean
c5cc771f16 // Context part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 07:51: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
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
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
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
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
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
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
tDidierjean
6e11355f43 [-] BO : fixed bug #PSCFI-1461 - Product updateDefaultAttribute function - small typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5914 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 10:16:41 +00:00
rGaillard
cfdc0ab1d9 [-] BO: Fixed module configuration when cache is activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5888 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-13 10:11:09 +00:00
aFolletete
5ef57ae0ac [*] Core : clean all deprecated methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5882 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-12 18:50:26 +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