dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,223 Commits 9 Branches 19 Tags
da2db7d799bfd4ce40a092b89c19f6d563bddb90
Commit Graph
9223 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
Rémi Gaillard 36b0eae84f Merge pull request #403 from MrManchot/patch-4 
Double 'id_image' definition in product getList
 2013-04-25 02:23:16 -07: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
Cédric Mouleyre a7986efda1 Send mail with the shop in the context 2013-04-25 11:59:25 +03:00
vAugagneur ac9a5c5a41 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
djfm d0f230da39 [*] TR : Removed hard-coded dot in history.tpl 2013-04-25 10:48:29 +02:00
Cédric Mouleyre 89723f9daf 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:31:10 +03: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
Francois Gaillard 50d52baa7b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-24 16:38:31 +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
Vincent Augagneur fd23578e1a Merge pull request #305 from Prestaworks/patch-9 
[-]BO: Fixes issue with logo name.
 2013-04-24 01:29:58 -07: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
vAugagneur 3607c2264f [-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back 2013-04-23 17:41:29 +02:00
vAugagneur c7bbf74913 //small fix on Link::getProductLink() 2013-04-23 17:33:15 +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
vAugagneur b84b44a44c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 14:22:45 +02:00
vAugagneur ece02e6bf3 Merge Pull Request #167 - Thanks @Zeyckler 2013-04-23 14:22:40 +02:00
Vincent Augagneur 5e9ba185ef Merge pull request #390 from ccauw/patch-7 
[*] BO : Add block "override_form_extra" in helper
 2013-04-23 05:20:43 -07: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
vAugagneur 2d2b9f76e0 Merge Pull Request #53 - Thanks @Caleydon 2013-04-23 11:40:08 +02:00
Francois Gaillard e61bd7c185 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 11:39:14 +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
vAugagneur da96eb6651 Merge Pull request #67 - Thanks @Ha99y 2013-04-23 10:02:29 +02:00
vAugagneur 18ed37127d Merge Pull Request #21 - thanks @Caleydon 2013-04-23 09:34:24 +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
vAugagneur 3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00