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

17853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 30d9ebe68f [-] FO : Fix bug #PSCFV-9624 try 302 redirect from old 1.4 images format to new _default before 404.gif 2013-08-12 16:44:25 +02:00
gRoussac 7ec55106ce [*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski 2013-08-12 16:23:54 +02:00
Gregory Roussac b7232aabd7 Merge pull request #643 from Shagshag/patch-2 
[*] BO :ProductDownload::getNewFilename() avoid recursion
 2013-08-12 00:29:33 -07:00
Shagshag ce20d55e77 ProductDownload::getNewFilename() little optimisation 
Avoid recursion
 2013-08-12 04:28:58 +02:00
Jerome Nadaud a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +02:00
Jerome Nadaud c35d846f60 [-] BO : FixBug root category listed after list reset 2013-08-09 12:16:05 +02:00
Jerome Nadaud 75f0b38ff1 // Syntax error 2013-08-09 11:38:59 +02:00
Jerome Nadaud cbc7b9567a [-] FO : Do not redirect on 301 when POST request 2013-08-09 10:20:42 +02:00
Jerome Nadaud 64698d1590 [-] FO : FixBug generated_date error 2013-08-09 09:10:53 +02:00
Jérôme Nadaud 84ded9f3db [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country 2013-08-08 23:30:31 +02:00
Jérôme Nadaud f5e28b9212 [-] FO : FixBug CGV does not pop-up in Fancy Box 2013-08-08 21:28:55 +02:00
Jerome Nadaud 390b49122e [-] FO : FixBug #PSCFV-10026 SSL error on ajax action 2013-08-08 15:58:52 +02:00
Jerome Nadaud be9398c6c5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-08 13:06:41 +02:00
Jerome Nadaud d5cdcab859 [-] MO : sendtofriend FixBug Form error 2013-08-08 13:06:18 +02:00
Gregory Roussac 49b6fda40f Merge pull request #639 from PrestaEdit/patch-49 
[-] BO: correct link in Block Discover.
 2013-08-08 03:09:29 -07:00
PrestaEdit 0023950c72 [-] BO: correct link in Block Discover. 2013-08-08 11:44:24 +02:00
Jerome Nadaud 7d4feac247 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-08 11:17:07 +02:00
Jerome Nadaud 8e72d122e6 [-] MO : blockcategories FixBug html tags in categories link title 2013-08-08 11:16:45 +02:00
Gregory Roussac bb45c93d4f Merge pull request #563 from Prestaworks/patch-12 
[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
 2013-08-08 02:00:57 -07:00
Jerome Nadaud 55fc51f20b [-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error 2013-08-08 10:41:22 +02:00
Jerome Nadaud 1c6eb93951 [-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it 2013-08-07 17:08:01 +02:00
Jerome Nadaud 44f7356d44 [-] BO : FixBug message charset problem in mail 2013-08-07 16:40:40 +02:00
Gregory Roussac de3b121b11 Merge pull request #507 from jeckyl/patch-3 
[*] BO : Fix size for modules logo AdminModulesPositions
 2013-08-07 07:04:13 -07:00
Jerome Nadaud 239c5adb5a [-] BO : FixBug smarty email variable override by blockcontact 2013-08-07 15:09:14 +02:00
Gregory Roussac 942a946147 Merge pull request #497 from romainberger/development 
[*] MO: Referral program: display currency in account page next to the voucher value
 2013-08-07 05:59:29 -07:00
Jerome Nadaud 5f1506ffc2 [-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country 2013-08-07 14:09:40 +02:00
Jerome Nadaud cd1ed74d8e [-] BO : FixBug #PSCFV-10038 escaped quote in address fields 2013-08-07 11:53:12 +02:00
Jerome Nadaud a32ff1e930 [-] BO : FixBug Missing tpl dir in default layout 2013-08-07 11:17:42 +02:00
Gregory Roussac 3213b5dffb Merge pull request #635 from cippest/development 
[-] BO : missing order lang in Mail::l for in_transit email
 2013-08-06 11:23:19 -07:00
cippest f8efd7a329 [-] BO : Fix send e-mails updating tracking number 
Hi,
We've fixed some bugs parameters about the Send function of Mail class in the AdminOrdersController.php.

Regards,
Massimo.
 2013-08-06 19:51:16 +02:00
gRoussac 7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
Gregory Roussac b1ea66d510 Merge pull request #528 from ldecoker/patch-7 
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
 2013-08-06 09:57:36 -07:00
Gregory Roussac bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
Vincent Augagneur 67b44b5f17 //fixed carrier bug and added typewatch plugin on range validation 2013-08-06 18:04:12 +02:00
Damien Metzger bfa5bae702 // Fixed display of root category 2013-08-06 17:45:24 +02:00
Damien Metzger 5be8e169f5 // Fixed totally unexplicable behavior 2013-08-06 17:40:49 +02:00
Vincent Augagneur ea5f4476a6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-06 16:56:05 +02:00
Vincent Augagneur 5ed75901fb //typo 2013-08-06 16:55:51 +02:00
Damien Metzger 2303677ebf // Rollback a modification in object model 2013-08-06 16:52:13 +02:00
Damien Metzger a1cf8d462f // Keep remote file retrieval in the right order 2013-08-06 16:42:10 +02:00
Damien Metzger b701acc8cf // Clean language pack retrieval 2013-08-06 16:15:30 +02:00
PhpMadman e4a42ab2b1 Update AdminPPreferencesController.php 2013-08-06 16:08:09 +02:00
PhpMadman d4270289c1 Update category-product-sort.tpl 2013-08-06 16:06:03 +02:00
Vincent Augagneur bcaa625f4c //default language fix in carrier wizard 2013-08-06 16:05:36 +02:00
Damien Metzger c8564fa6b2 // Quick CSS fix 2013-08-06 16:02:22 +02:00
Damien Metzger d783160af0 // Updated installer 2013-08-06 15:53:59 +02:00
Jerome Nadaud 375fa451d8 [-] FO : FixBug No warning message when no carriers available from advanced stock management 2013-08-06 15:53:25 +02:00
Damien Metzger 38753716e2 // Hide "is root category" option outside multistore 2013-08-06 15:42:31 +02:00
PhpMadman 598a5b3188 [*] FO : Add reference sort to theme 2013-08-06 15:38:25 +02:00
PhpMadman cd254f8795 [*] FO : Add reference sort to theme 2013-08-06 15:37:10 +02:00