dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur 43a333ff03 //remove useless comments 2013-05-21 11:28:24 +02:00
vAugagneur dc5df43d16 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur 70b061343b Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
Vincent Augagneur 6d6b2ef7d3 Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
Rémi Gaillard 0ddc7e0e4b // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard 7576bc18e4 // small fix 2013-05-21 11:06:23 +02:00
Rémi Gaillard b573b39acb [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
Rémi Gaillard 3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page 2013-05-21 10:56:55 +02:00
vAugagneur 2a606999fd //small bug 2013-05-21 10:30:35 +02:00
vAugagneur 0d4fd0729b //small bug 2013-05-21 10:30:35 +02:00
Vincent Augagneur 69c045d8fd Merge pull request #429 from PrestaEdit/patch-34 
[-] BO: Ajax Confirmation / padding-left
 2013-05-21 01:25:54 -07:00
Vincent Augagneur 5c9abe1194 Merge pull request #429 from PrestaEdit/patch-34 
[-] BO: Ajax Confirmation / padding-left
 2013-05-21 01:25:54 -07:00
Grégoire Bélorgey 0759fd36c0 Merge branch 'development' of github.com:MyBB-Services/PrestaShop into development 2013-05-21 08:18:23 +02:00
Rémi Gaillard 7d5830af94 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Rémi Gaillard 532a727cc2 // add hack for blockcart cache and back button 2013-05-20 17:30:04 +02:00
Kevin Granger 3fd3ad2919 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
Kevin Granger 2a3820f068 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
vAugagneur e01383c5a1 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur 5244fdaa21 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur ec87deb016 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur 90f0781377 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
vAugagneur 7aef793e65 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
Vincent Augagneur d106d3a136 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur e157a8f0d4 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur 3368ff1d69 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
Vincent Augagneur 3bd489df15 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
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