dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,019 Commits 9 Branches 19 Tags
d5817a56cc847e4d379f785871950dfa7b686f3e
Commit Graph
9019 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cédric MouleyreandRémi Gaillard d5817a56cc Double 'id_image' definition in product getList 
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
 2013-04-25 11:29:01 +02:00
Damien Metzger 2ba2336df4 Merge pull request #402 from djfm/release 
[*] TR : Improved English text of installer
 2013-04-25 02:17:35 -07:00
Damien Metzger 1d8c2f84c3 [-] FO : do not use dispatcher routes for static files 2013-04-25 11:06:54 +02:00
Rémi Gaillard 2b23268bec [-] BO: Fix htaccess generation for subfolders installation 2013-04-25 11:04:48 +02:00
djfm d0f230da39 [*] TR : Removed hard-coded dot in history.tpl 2013-04-25 10:48:29 +02:00
djfm e664335f4d [*] TR : Improved English text of installer 2013-04-25 10:24:13 +02:00
gRoussac 91ab0362db [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
Damien Metzger 7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger 0e9a4a8272 // Changed default value of checkbox in install 2013-04-25 08:41:31 +02:00
Rémi Gaillard 9a326bd844 // Also update the tax display for unidentified and guest group on localization import 2013-04-24 19:01:10 +02:00
Damien Metzger c6710bf26f // Switch iframe to https 2013-04-24 18:31:51 +03:00
gRoussac 7081e6d0d0 [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
Francois Gaillard 2c3f2eb1da //new addons url in install process 2013-04-24 16:39:04 +02:00
Damien Metzger 4df54ce743 // Fixed warning in translations 2013-04-24 16:27:45 +02:00
Damien Metzger 71f0986535 // Small translation fix 2013-04-24 15:45:58 +02:00
Damien Metzger 64684fe6c9 // Small fix translations 2013-04-24 15:29:00 +02:00
Damien Metzger 3948903884 // Write theme translations... in the theme 2013-04-24 10:29:02 +02:00
Damien Metzger 9eb84825a6 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Vincent Terenti 2c802ad4ec // Fix translation behavior 2013-04-23 19:10:31 +02:00
Damien Metzger 6f96f0ac9a [-] FO : invoice: do not display taxes table if there is not tax to display 2013-04-23 16:46:11 +02:00
Rémi Gaillard 913d0d9711 // small text change 2013-04-23 15:51:30 +02:00
Damien Metzger 9395d95548 [-] FO : Fixed product comparator CSS 2013-04-23 15:35:21 +02:00
Damien Metzger c191b36fb6 // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Damien Metzger 23dacfd754 // Change link to the documentation in the installer 2013-04-23 14:57:24 +02:00
Damien Metzger d8313760ec // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Rémi Gaillard 9282e310f4 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
Damien Metzger b9a877625c // Fixed warning 2013-04-23 11:36:13 +02:00
Damien Metzger 7ce6502600 // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
Rémi Gaillard d8453cccfb Merge pull request #398 from djfm/release 
[*] TR : added russian installer tabs
 2013-04-22 09:42:39 -07:00
djfm 88dce29e32 [*] TR : added russian installer tabs 2013-04-22 18:37:28 +02:00
Rémi Gaillard 4adc9f2ccf Merge pull request #397 from djfm/release 
[*] TR : Fixed wrong use of translation functions
 2013-04-22 08:46:15 -07:00
djfm 19ce381cba [*] TR : Fixed wrong use of translation functions in AdminTranslationsController 2013-04-22 17:24:47 +02:00
Damien Metzger 260dd12edd Merge pull request #396 from djfm/installer_tabs 
[*] TR : Added tab translations for installer languages
 2013-04-22 07:01:40 -07:00
djfm 6a70093416 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
gRoussac bcdb85c309 [*] FO : one_phone_at_least should be set 2013-04-22 12:20:39 +02:00
gRoussac 5be95a8a98 [-] Fo : Remove additionnal space in phone field value 2013-04-22 12:20:23 +02:00
gRoussac 58884b2da7 [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-22 12:20:07 +02:00
Rémi Gaillard c96b4ca248 [-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by 2013-04-19 15:48:18 +02:00
Rémi Gaillard 9c1bf63ab9 // fix display of accessories for products without combinations 2013-04-19 15:15:25 +02:00
Rémi Gaillard ba7f9620c3 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-19 15:14:51 +02:00
gRoussac dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard 103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur ea0203f43f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur 75d395c84a [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac 2a3789d48b [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur b52c71c7ad [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard 45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac 0a8eddf7d6 [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
Rémi Gaillard f24022311e [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00