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 Mouleyre
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
Damien Metzger
4e21c56d1b
// Changed translation tool behavior with dev mode and overrides
2013-04-23 11:21:10 +02:00
djfm
0da1eb9e35
[*] TR : Fixed wrong use of translation functions in AdminTranslationsController
2013-04-22 17:24:47 +02:00
vAugagneur
5fb2bb9ee2
[*] BO : added new button on manufacturers view
2013-04-22 14:56:59 +02:00
Damien Metzger
141772725b
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +02:00
Vincent Augagneur
7c43ae05fc
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
29c0761645
// Removed useless message
2013-04-18 16:53:27 -03:00
gRoussac
1a8ab7f68c
[-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop
2013-04-18 17:28:16 +02:00
vAugagneur
e9b8af0e97
[-] BO - fixed bug #PSCFV-8614
2013-04-18 15:14:37 +02:00
Rémi Gaillard
986d57148f
//AdminModulesController::extractArchive() now return something
2013-04-18 14:58:43 +02:00
Rémi Gaillard
ab700a6285
[-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825
2013-04-18 14:24:50 +02:00
gRoussac
ee3e2ac6dc
[-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC
2013-04-18 11:26:50 +02:00
Rémi Gaillard
f83b91ae51
// Fix smarty cache after modules translation update
2013-04-17 14:44:20 +02:00
Rémi Gaillard
96ee6386c1
[-] BO: Fix admin carts currency prices on view and listing
2013-04-16 14:14:04 +02:00
gRoussac
efb90cb0a6
[-] BO : Remove typo in address formating fields links
2013-04-16 12:15:31 +02:00
gRoussac
f2bdb73d39
[-] FO : Undefined free_shipping in POC when updateQty
2013-04-16 11:28:22 +02:00
gRoussac
00d7d78ba6
[-] FO : Class free order name for validateOrder
2013-04-15 18:51:41 +02:00
gRoussac
eca4a87082
[-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers
2013-04-15 18:30:41 +02:00
gRoussac
5989481859
[-] BO : Remove undefined name when module can not be installed
2013-04-15 16:21:03 +02:00
Rémi Gaillard
7a89d0596f
[-] BO: Don't delete the directory of modules before upgrade them
2013-04-15 11:17:17 +02:00
Daniel
7f5a78a120
Update AdminThemesController.php
2013-04-12 18:51:50 +08:00
gRoussac
a73c09ab4c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-12 12:04:21 +02:00
gRoussac
fcce2d2737
[-] FO : Fix login cookie issues
2013-04-12 12:03:16 +02:00
sLorenzini
9060661cef
[-] FO: fixed bug #PSCFV-3238 - compareController typo
2013-04-12 11:51:38 +02:00
sLorenzini
1ebd625563
[-] 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
239dcb0179
Merge pull request #377 from PrestaEdit/patch-28
...
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
vAugagneur
7a27fa2f64
[-] FO : standardize behavior of selected country in the list when create a new address
2013-04-11 10:30:22 +02:00
Rémi Gaillard
f43aee9a25
[-] BO: PSCFV-7685 parent category for root categories after upgrade
2013-04-10 18:52:59 +02:00
gRoussac
1b01c7a602
[-] BO : Fix bug #PSCFV-8626 rename actual admin folder
2013-04-09 17:43:15 +02:00
gRoussac
e5cf7a4c06
[-] BO : Fix bug #PSCFV-8620 returns with customized product
2013-04-09 10:37:15 +02:00
PrestaEdit
86c6b3154f
[+] BO: show all languages in setting of employee
2013-04-09 00:33:49 +03:00
Rémi Gaillard
881b6e7a8b
// something was missing in last commit
2013-04-08 17:53:56 +02:00
Rémi Gaillard
3ffe339a76
[*] 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
François Gaillard
b9e3436e30
[-] Classes : Bug fix : OrderOpcController, check instance of blocknewsletter module
2013-04-05 10:07:29 +02:00
Damien Metzger
a1589621a5
// Added SEO warning for accented chars in URL
2013-04-05 09:55:18 +02:00