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

54 Commits

Author SHA1 Message Date
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
rMalie
c9ad75fe11 // Routes for dispatcher (part 3) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7743 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-26 16:47:41 +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
4f76b91de5 // Routes for dispatcher (part 2) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7728 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 20:16:53 +00:00
tDidierjean
0fbd146713 // Context part 19 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7724 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 16:42:48 +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
rMalie
e08b70a242 // Carrier association + discount association 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 15:53:07 +00:00
rMalie
10e68bda6b // Add scenes for multistore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7692 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 12:27:42 +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
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
rMalie
fce17efbb8 // Remove some other mysql_ in code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7652 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 11:51:12 +00:00
rMalie
fa2fc8b69d // No more mysql_error() hard coded ! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7651 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 11:35:33 +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
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
tDidierjean
2c493137c3 // Context part 11 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7644 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-18 15:50:58 +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
20276404a8 // Context part 7 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7629 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-15 13:59:26 +00:00
tDidierjean
3a922aabfe // Context part 6 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7625 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-13 16:35:06 +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
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
39d0acc30b // Hook modules exceptions now works with new dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7587 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-11 15:16:16 +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
rMalie
4f3aad65e3 // Multishop for referrers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-11 13:03:26 +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
rMalie
3d9b61023c // Generate .htaccess in adminShopUrl 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7534 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-06 14:35:19 +00:00
rMalie
8ed089decf git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7532 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:54:12 +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
0433d8b7f4 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7525 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 12:45: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
mMarinetti
1499e8bf94 [-] BO : Fixed #PSCFI-1736 - in AdminTranslations.php, only theme directory are parsed (and not files) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6147 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-05-02 15:50:39 +00:00
vAugagneur
1613e871e6 //merge 1.4 => 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6139 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-05-02 12:27:04 +00:00
vAugagneur
35ff645731 //merge 1.4 => 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-29 12:34:09 +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
aFolletete
6e34cc3f77 // merge 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6062 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-25 12:07:31 +00:00
gBrunier
66494a5a83 [-] BO : Fixed #PSCFI-1624 - Extra forward slash 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6058 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-24 17:53:37 +00:00
gBrunier
a79b9537ac [-] BO : Fixed #PSCFI-1624 - Extra forward slash 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6057 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-24 17:53:29 +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
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
aFolletete
6f98aff114 // merge form 1.4 version (rev. 5937) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5938 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-15 16:46:20 +00:00