Commit Graph

2472 Commits

Author SHA1 Message Date
Damien Metzger
1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
Cédric Mouleyre
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
vAugagneur
ac9a5c5a41 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +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
Damien Metzger
7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +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
Damien Metzger
d8313760ec // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +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
djfm
19ce381cba [*] TR : Fixed wrong use of translation functions in AdminTranslationsController 2013-04-22 17:24:47 +02:00
vAugagneur
3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
Damien Metzger
e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Vincent Augagneur
c643abcfa2 Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
Damien Metzger
bfbc46cf51 // Removed useless message 2013-04-18 16:53:27 -03:00
gRoussac
dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
vAugagneur
b52c71c7ad [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard
a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
Rémi Gaillard
a172632600 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard
3d8b28ac93 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
gRoussac
b95e8e0bc9 [-] BO : Remove typo in address formating fields links 2013-04-16 12:15:31 +02:00
gRoussac
c83bc07f20 [-] BO : Remove undefined name when module can not be installed 2013-04-15 16:21:03 +02:00
Rémi Gaillard
7fddcd3f38 [-] BO: Don't delete the directory of modules before upgrade them 2013-04-15 11:17:17 +02:00
Daniel
20901e5c85 Update AdminThemesController.php 2013-04-12 18:51:50 +08:00
sLorenzini
a7d61c551e [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
Vincent Augagneur
710783c066 Merge pull request #377 from PrestaEdit/patch-28
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
Rémi Gaillard
345ec87993 [-] BO: PSCFV-7685 parent category for root categories after upgrade 2013-04-10 18:52:59 +02:00
gRoussac
b623f50df7 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder 2013-04-09 17:43:15 +02:00
gRoussac
01bcb38522 [-] BO : Fix bug #PSCFV-8620 returns with customized product 2013-04-09 10:37:15 +02:00
PrestaEdit
40ad032dd4 [+] BO: show all languages in setting of employee 2013-04-09 00:33:49 +03:00
Rémi Gaillard
582bc67633 // something was missing in last commit 2013-04-08 17:53:56 +02:00
Rémi Gaillard
c6d8b91287 [*] BO: The translation of modules are now made in the theme if modules are overrided or directly in the module folder 2013-04-08 17:50:43 +02:00
Damien Metzger
5fab6394ef // Added SEO warning for accented chars in URL 2013-04-05 09:55:18 +02:00
Rémi Gaillard
24947d3ae6 [-] FO: Extension test on file attachment for contact form should not be case sensitive #PSCFV-8616 2013-04-04 19:03:27 +02:00
gRoussac
c3ce452405 [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00
gRoussac
2a3373eb1d [-] BO : Fix bug #PSCFV-8481 no live edit on index when one language is active only 2013-03-29 11:37:08 +01:00
Rémi Gaillard
c2d8853f57 [*] BO: List all modules with an upgrade available on AdminModules header 2013-03-27 18:58:21 +01:00
Francois Gaillard
77871338c6 // Release branch merged 2013-03-27 10:25:16 +01:00
gRoussac
033daeb7ff // admin folder name 2013-03-26 19:15:37 +01:00
gRoussac
e11f0e7ce9 [-] BO : Remove warning at login template 2013-03-26 18:58:03 +01:00
Rémi Gaillard
d2db198e4e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-26 18:23:33 +01:00
Rémi Gaillard
db1a2fccf9 // Also clear language cache in AdminTranslationsController 2013-03-26 18:23:17 +01:00
gRoussac
9f56750b43 // remove warning 2013-03-26 18:10:32 +01:00