dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

17570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PrestaEdit c0b9736cf4 // Set param as null 2013-05-20 14:56:12 +02:00
PrestaEdit 62f350334c // Set param as null 2013-05-20 14:56:12 +02:00
PrestaEdit 7864f38438 // Set params as null 2013-05-20 14:49:45 +02:00
PrestaEdit c573819dc9 // Set params as null 2013-05-20 14:49:45 +02:00
Vincent Augagneur 7da7fd94fd Merge pull request #439 from Prestaworks/patch-11 
Update _shipping.tpl
 2013-05-20 02:34:46 -07:00
Vincent Augagneur bf2cb18c1f Merge pull request #439 from Prestaworks/patch-11 
Update _shipping.tpl
 2013-05-20 02:34:46 -07:00
Vincent Augagneur 3a9f82a7f0 Merge pull request #440 from MrManchot/patch-8 
Add Wysiwyg in Category Controller
 2013-05-20 02:28:57 -07:00
Vincent Augagneur 8e64dd9141 Merge pull request #440 from MrManchot/patch-8 
Add Wysiwyg in Category Controller
 2013-05-20 02:28:57 -07:00
Vincent Augagneur 12c43acd5b Merge pull request #443 from PrestaEdit/patch-37 
[-] Translations: .. instead of .
 2013-05-20 02:25:55 -07:00
Vincent Augagneur 025550b4ce Merge pull request #443 from PrestaEdit/patch-37 
[-] Translations: .. instead of .
 2013-05-20 02:25:55 -07:00
Rémi Gaillard 7f92b45c33 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard 2fe8b5cf23 // small fix again... 2013-05-20 11:08:05 +02:00
Rémi Gaillard 614556ec3d // small fix 2013-05-20 10:58:49 +02:00
Rémi Gaillard 26a3dc2f62 // small fix 2013-05-20 10:58:49 +02:00
Rémi Gaillard 1edbebf8f5 [-] MO: Don't make unnecessary request to ajax cart 2013-05-20 10:50:34 +02:00
Rémi Gaillard 996b8e145f [-] MO: Don't make unnecessary request to ajax cart 2013-05-20 10:50:34 +02:00
Rémi Gaillard a508be0a07 Merge pull request #442 from raulgundin/patch-1 
[-] CORE: Fix #PSCFV-9185 Wrong product price display (list by manufacturer)
 2013-05-20 00:53:07 -07:00
Rémi Gaillard a14520f825 Merge pull request #442 from raulgundin/patch-1 
[-] CORE: Fix #PSCFV-9185 Wrong product price display (list by manufacturer)
 2013-05-20 00:53:07 -07:00
PrestaEdit fc1ecf0a70 [-] Translations: .. instead of . 2013-05-19 00:14:39 +02:00
PrestaEdit e996eeeed1 [-] Translations: .. instead of . 2013-05-19 00:14:39 +02:00
raulgundin 5c0605d73f [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer 
Added default_on condition on getProducts() query in Manufacturer class.
 2013-05-18 14:38:07 +03:00
raulgundin e7393dc5d0 [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer 
Added default_on condition on getProducts() query in Manufacturer class.
 2013-05-18 14:38:07 +03:00
gRoussac eb74e0c2d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-17 18:09:32 +02:00
gRoussac 110064a0c1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-17 18:09:32 +02:00
gRoussac 7123d47f91 [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() 2013-05-17 17:56:42 +02:00
gRoussac e2cfa9f08e [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() 2013-05-17 17:56:42 +02:00
Rémi Gaillard 626e556575 [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 2013-05-17 17:10:11 +02:00
Rémi Gaillard 8b95e9f2ca [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 2013-05-17 17:10:11 +02:00
Rémi Gaillard d096a5845e [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +02:00
Rémi Gaillard d691e1d403 [-] MO: Fix #PSCFV-8973 product images in the blockviewed module 2013-05-17 16:35:21 +02:00
Cédric Mouleyre 334c5d35fd Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03:00
Cédric Mouleyre f921fd2352 Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03:00
Daniel ce9f147d58 Update _shipping.tpl 
Added target="_blank" so when clicking on the tracking link, the user do not risk "loosing" the order by closing the tracking page by misstake.
 2013-05-17 11:48:47 +08:00
Daniel c63ca0cdf8 Update _shipping.tpl 
Added target="_blank" so when clicking on the tracking link, the user do not risk "loosing" the order by closing the tracking page by misstake.
 2013-05-17 11:48:47 +08:00
PrestaEdit 57bb00a6a8 [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) 2013-05-17 00:52:39 +02:00
PrestaEdit 4253754afd [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) 2013-05-17 00:52:39 +02:00
PrestaEdit fe4223593d [-] Class: Tools / displayDate (displayParameterAsDeprecated) 2013-05-17 00:40:22 +02:00
PrestaEdit 2e9efe58cc [-] Class: Tools / displayDate (displayParameterAsDeprecated) 2013-05-17 00:40:22 +02:00
gRoussac 2bfad8017e [-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller 2013-05-16 18:30:58 +02:00
gRoussac eaa5605e91 [-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller 2013-05-16 18:30:58 +02:00
gRoussac 0765dde5c0 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected 2013-05-16 11:24:44 +02:00
gRoussac e7f54d3694 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected 2013-05-16 11:24:44 +02:00
gRoussac 11eaf792e9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-16 11:05:28 +02:00
gRoussac 2cd6724591 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-16 11:05:28 +02:00
gRoussac 11575fb749 [-] CORE : referer keywords truncated before insertion in connections table 2013-05-16 11:05:19 +02:00
gRoussac 0753dab214 [-] CORE : referer keywords truncated before insertion in connections table 2013-05-16 11:05:19 +02:00
Damien Metzger 9a2ddd7608 [-] BO : fixed gift deletion when there is no products anymore in the cart 2013-05-16 11:03:21 +02:00
Damien Metzger 21d45b61bd [-] BO : fixed gift deletion when there is no products anymore in the cart 2013-05-16 11:03:21 +02:00
prestarocket 112583edeb [-] FO : first_item class don t exist if shopping cart have only one item 
if shopping cart have only one product, last_item class exist but not
first_item because of "else if" after if isset($productLast)
 2013-05-16 10:37:02 +02:00
gRoussac 0a0f313de7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 17:12:55 +02:00