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

57 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
26efd329a3 // Move theme choice from AdminTheme page to Shop page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7848 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 13:47:34 +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
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
dMetzger
287a5f42dc [+] BO : you can now set detailed permissions for each module in the back end 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7818 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-31 16:39:53 +00:00
tDidierjean
b3b7dd32bf // Context part 28 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7814 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-29 15:06:20 +00:00
tDidierjean
5d090a25b3 // Context part 27 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-29 14:29:57 +00:00
tDidierjean
d80c7b5ba8 // Context part 26 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7804 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 16:37:50 +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
8ef7835cd6 // Fix #PSFV-21 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7748 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:15:21 +00:00
rMalie
ad270d5ea8 // Fix #PSFV-20 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7747 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 08:12:31 +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
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
1a462e0a85 // Fix strict standard on paymentModule + fix stats SQL bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7689 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 09:49:29 +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
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
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
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
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
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
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
rMalie
2ee764963b // Fix shop association on new object + some strict standard for Franck 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7584 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-11 13:18:17 +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
c0e8f46e8e // Fix stats queries 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7537 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-06 16:17:27 +00:00
rGaillard
d218264667 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7531 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:52:30 +00:00
rMalie
874478118f // blocklayered fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7529 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-06 13:27:41 +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
gBrunier
fbe279894a [-] MO : Not correct display of "date_add" for the discounts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6148 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-05-03 08:53:37 +00:00
dMetzger
eb9d9719be [-] MO : modules exceptions stability improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6140 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-05-02 12:36:27 +00:00
dMetzger
92316e3710 [*] MO : theme installer can now manage module exceptions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6128 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-29 13:41:10 +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
fSerny
1bbcd95d9e [-] MO : Changing url in Dibs module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6096 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-28 11:48:24 +00:00
gBrunier
1044d7be8c [-] MO : Fixed bug #PSCFI-1574 - When only one language was activated iso code was still used. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6077 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-27 14:20:08 +00:00