dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

6950 Commits

Author SHA1 Message Date
vAugagneur de887cc078 Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
vAugagneur 9f9562f92b Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
gRoussac 701d9e50af [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping 2013-04-16 18:56:00 +02:00
gRoussac 27212bd126 [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping 2013-04-16 18:56:00 +02:00
Vincent Augagneur 1a795cfe4a Merge pull request #366 from kluevandrew/patch-2 
[FIX] Bug in Controller class
 2013-04-16 06:13:48 -07:00
Vincent Augagneur dc529264e0 Merge pull request #366 from kluevandrew/patch-2 
[FIX] Bug in Controller class
 2013-04-16 06:13:48 -07:00
gRoussac 47c118c3ca [-] FO : empty cache getContextualValue_ when updating cart quantity 2013-04-16 15:00:24 +02:00
gRoussac 0f98ff12e1 [-] FO : empty cache getContextualValue_ when updating cart quantity 2013-04-16 15:00:24 +02:00
Rémi Gaillard 8c5143de9e [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here 2013-04-16 12:01:04 +02:00
Rémi Gaillard 7bb98b16f3 [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here 2013-04-16 12:01:04 +02:00
gRoussac 62fd5c6195 // small change on quantity_per_user cart rule created on ValidateOrder 2013-04-16 11:44:09 +02:00
gRoussac 3615c225b3 // small change on quantity_per_user cart rule created on ValidateOrder 2013-04-16 11:44:09 +02:00
Andrew a93cfbec07 Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
Andrew 03eadb3d6a Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
gRoussac bf90c8cf84 // remove sql parse error 2013-04-15 12:10:27 +02:00
gRoussac dc2e2d0adf // remove sql parse error 2013-04-15 12:10:27 +02:00
gRoussac 047551952e [-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically 2013-04-15 11:48:27 +02:00
gRoussac 22b506dd41 [-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically 2013-04-15 11:48:27 +02:00
gRoussac 0256ee7c59 [-] FO : add cart rul when cart rul has several groups 2013-04-12 18:03:38 +02:00
gRoussac 5d3f48354b [-] FO : add cart rul when cart rul has several groups 2013-04-12 18:03:38 +02:00
vAugagneur f0209dd447 //small spellchecking 2013-04-12 11:46:38 +02:00
vAugagneur 846d6c489d //small spellchecking 2013-04-12 11:46:38 +02:00
Rémi Gaillard 3cbd8444d6 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00
Rémi Gaillard 8d06ff3044 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00
vAugagneur c1518dfcbf [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php 2013-04-11 12:00:31 +02:00
vAugagneur 63bcd22bc6 [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php 2013-04-11 12:00:31 +02:00
François Gaillard 1ae6507973 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 10:28:49 +02:00
Francois Gaillard 8793024d56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 10:28:49 +02:00
François Gaillard 8125a2e5b4 // Fixed Tools::jsonEncode() on Tools.php 2013-04-11 10:28:38 +02:00
Francois Gaillard 9c3417bfff // Fixed Tools::jsonEncode() on Tools.php 2013-04-11 10:28:38 +02:00
gRoussac 17012ea00d [*] Installer : Set context in upgrader 2013-04-10 17:57:33 +02:00
gRoussac ec63aa4064 [*] Installer : Set context in upgrader 2013-04-10 17:57:33 +02:00
vAugagneur 3ba776a9d1 [-] FO - fixed bug #PSCFV-8612 - Payment module: Bug in country restriction in multi store 2013-04-09 14:59:15 +02:00
vAugagneur 648da86eac [-] FO - fixed bug #PSCFV-8612 - Payment module: Bug in country restriction in multi store 2013-04-09 14:59:15 +02:00
Rémi Gaillard a720b19854 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs 2013-04-08 14:58:29 +02:00
Rémi Gaillard 419ed00e58 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs 2013-04-08 14:58:29 +02:00
Rémi Gaillard 90878d8a80 [-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675 2013-04-08 11:35:08 +02:00
Rémi Gaillard f310ec5346 [-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675 2013-04-08 11:35:08 +02:00
gRoussac d6ee2acc90 [-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs 2013-04-08 10:50:03 +02:00
gRoussac 6384a74c1d [-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs 2013-04-08 10:50:03 +02:00
gRoussac 5b6dc1e9e9 [-] BO : Fix bug #PSCFV-8540 setting cookie key in cache key 2013-04-05 17:59:46 +02:00
gRoussac f9de39b225 [-] BO : Fix bug #PSCFV-8540 setting cookie key in cache key 2013-04-05 17:59:46 +02:00
Rémi Gaillard 26bdf77308 // And now use smarty cache groups for cache ids to be more efficient 2013-04-05 11:57:52 +02:00
Rémi Gaillard 2837c0e34e // And now use smarty cache groups for cache ids to be more efficient 2013-04-05 11:57:52 +02:00
Rémi Gaillard a77111dc62 [-] Core: Cache of Cart::getPackageList is now per cart 2013-04-04 14:35:14 +02:00
Rémi Gaillard c67ea6c022 [-] Core: Cache of Cart::getPackageList is now per cart 2013-04-04 14:35:14 +02:00
gRoussac df4e3a0000 [*] FO : Check if grid_prestashop.css is available in theme before including 2013-04-04 12:48:22 +02:00
gRoussac f00d0e8471 [*] FO : Check if grid_prestashop.css is available in theme before including 2013-04-04 12:48:22 +02:00
gRoussac e59274fb2b [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00
gRoussac c3ce452405 [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00