djfm
da2db7d799
// parse error
2013-05-22 11:11:37 +02:00
Rémi Gaillard
3d9596aa99
[*] FO: Don't make useless ajax requests to blockcart on the cart page
2013-05-21 10:56:55 +02:00
vAugagneur
3328c7a653
[-] BO : remove deprecated parameter when call Tools::displayDate()
2013-05-20 16:55:52 +02:00
Vincent Augagneur
8e64dd9141
Merge pull request #440 from MrManchot/patch-8
...
Add Wysiwyg in Category Controller
2013-05-20 02:28:57 -07:00
PrestaEdit
e996eeeed1
[-] Translations: .. instead of .
2013-05-19 00:14:39 +02:00
Cédric Mouleyre
f921fd2352
Add Wysiwyg Category Controller
2013-05-17 12:00:43 +03:00
gRoussac
eaa5605e91
[-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller
2013-05-16 18:30:58 +02:00
Damien Metzger
3e4ef99214
[-] BO : fixed issue with reduction in the category for groups #PSCFV-9101
2013-05-15 15:23:13 +02:00
gRoussac
be977a5f17
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-05-15 11:32:03 +02:00
gRoussac
9b615244b1
[-] 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
f33e8d8b4a
[-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts
2013-05-14 18:13:07 +02:00
Damien Metzger
52bffe6917
// Fixed warning
2013-05-07 17:27:16 +02:00
Damien Metzger
9ce563e332
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
f4df47986b
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
80b5855006
[-] BO : fixed potential warning with texture list #PSCFV-9050
2013-05-06 09:27:03 +02:00
Rémi Gaillard
63993a425b
[-] BO: You can now disable the email sent after account creation
2013-05-03 17:01:12 +02:00
Edouard Gaulué
0442bee919
[-] BO : don't show unecessary tpl module translations - complience with documentation
2013-05-02 18:46:13 +02:00
Rémi Gaillard
41786587ba
[-] 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é
444a99f564
[-] BO : don't show translation for class/controler overrides when on modules translation page
2013-05-02 18:21:54 +02:00
Damien Metzger
fb604492b7
[-] BO : fixed infinite loop in the categories #PSCFV-8965
2013-05-02 16:06:26 +02:00
Dragan Skrbic
7f8a33763a
// Fixed image import
2013-04-29 18:07:42 +02:00
Damien Metzger
3600a31862
[-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181
2013-04-29 17:45:45 +02:00
Rémi Gaillard
bfc8a0ad02
[-] 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
94090e2a39
// Fixed directory creation in translation #PSCFV-8212
2013-04-29 12:08:45 +02:00
Damien Metzger
43a897436a
[-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785
2013-04-29 11:16:26 +02:00
Damien Metzger
459768d1ac
[-] BO : fixed error message in language form #PSCFV-8890
2013-04-29 10:47:59 +02:00
Vincent Augagneur
218a76c443
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
fe05e1cc39
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
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