dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,265 Commits 9 Branches 19 Tags
82c7e3eeff78f01f05d897029730f045c7a943ae
Commit Graph
2987 Commits
Author SHA1 Message Date
dreammeup 82c7e3eeff Correcting errors in order graph at admin home 
The SQL request was returning multiple lines for every days. This modification change the request to have one line for the 7 days of the week.

So it corrects the number who was totally wrong.
 2013-07-16 15:34:52 +02:00
gRoussac f0dbe3b86c [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 11:23:33 +02:00
gRoussac 95e46afc99 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-24 17:21:56 +02:00
Vincent Augagneur 56831b9f33 Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
vAugagneur 487c567224 //small fix 2013-05-22 14:38:39 +02:00
djfm 5b250dbe8d // parse error 2013-05-22 11:11:37 +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
vAugagneur e01383c5a1 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02: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
PrestaEdit fc1ecf0a70 [-] Translations: .. instead of . 2013-05-19 00:14:39 +02:00
Cédric Mouleyre 334c5d35fd Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03: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
Damien Metzger e1afce7f22 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 2013-05-15 15:23:13 +02:00
gRoussac 37193efc9d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 11:32:03 +02:00
gRoussac c7aa92f3b3 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
Rémi Gaillard 84aff1d469 [-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts 2013-05-14 18:13:07 +02:00
Damien Metzger 11fdc8f74b // Fixed warning 2013-05-07 17:27:16 +02:00
Damien Metzger 387b54d322 Merge pull request #419 from e-gaulue/Module_translation_patch 
[-] BO : don't show translations for module overrides in admin modules translation page
 2013-05-06 07:09:58 -07:00
Damien Metzger 7c4cabf0f2 Merge pull request #420 from e-gaulue/Module_translation_patch_2 
[-] BO : don't show unecessary tpl module translations - complience with documentation
 2013-05-06 07:08:41 -07:00
Damien Metzger 2af342c864 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Edouard Gaulué 4346d9e57c [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +02:00
Rémi Gaillard abcb083cb3 [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Edouard Gaulué fdb931e3e8 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Rémi Gaillard 4d4eb9df19 [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Edouard Gaulué 467c183564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
Damien Metzger 87be8bd39e [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
Dragan Skrbic d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
Rémi Gaillard dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Damien Metzger 527f87a691 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger 903b17979c [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Vincent Augagneur ad17dbc700 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
Vincent Augagneur 5438a131b4 Merge pull request #330 from DrySs/patch-5 
[-] FO: CMS link to conditions should not be in SSL
 2013-04-29 01:22:21 -07:00
Damien Metzger 6251815c37 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
François Gaillard 6106066ef1 // Release branch merged 2013-04-25 17:00:56 +02:00
Cédric MouleyreandRémi Gaillard a8b89d7411 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 cde13e7707 Merge pull request #403 from MrManchot/patch-4 
Double 'id_image' definition in product getList
 2013-04-25 02:23:16 -07:00
vAugagneur 1280152db9 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
Cédric Mouleyre e344863a3c 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
Damien Metzger b2b17eb041 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger 7cafc7bdf5 // Fixed warning in translations 2013-04-24 16:27:45 +02:00
Damien Metzger feb1edc076 // Small translation fix 2013-04-24 15:45:58 +02:00
Damien Metzger 75dd65f207 // Small fix translations 2013-04-24 15:29:00 +02:00
Vincent Augagneur ec45ea725f Merge pull request #305 from Prestaworks/patch-9 
[-]BO: Fixes issue with logo name.
 2013-04-24 01:29:58 -07:00
Damien Metzger 83f132aa78 // Write theme translations... in the theme 2013-04-24 10:29:02 +02:00
Damien Metzger d16f30f322 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Vincent Terenti 2d1a4ed180 // Fix translation behavior 2013-04-23 19:10:31 +02:00
Damien Metzger 4be1bef203 // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Damien Metzger 13c435a54b // Fixed warning 2013-04-23 11:36:13 +02:00