Rémi Gaillard
eb7cf3dbbb
// delete char
2013-04-25 14:20:27 +02:00
Rémi Gaillard
5ac2a0d946
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-04-25 11:41:09 +02:00
Rémi Gaillard
17209a1725
// update default languages pack
2013-04-25 11:40:54 +02:00
Damien Metzger
907047165b
// Added english pack in the installer
2013-04-25 11:29:35 +02:00
Cédric Mouleyre and Ré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
Damien Metzger
45f54ce08d
Merge pull request #402 from djfm/release
...
[*] TR : Improved English text of installer
2013-04-25 02:17:35 -07:00
Damien Metzger
35d3d1d6c5
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
Rémi Gaillard
e827d3355d
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
djfm
f7f137fec1
[*] TR : Removed hard-coded dot in history.tpl
2013-04-25 10:48:29 +02:00
djfm
8f406fcd1d
[*] TR : Improved English text of installer
2013-04-25 10:24:13 +02:00
gRoussac
125884d8c0
[-] BO : Fix bug witth shop address and no state in country
2013-04-25 10:12:23 +02:00
Damien Metzger
b2b17eb041
// Removed deprecated block for new installs
2013-04-25 09:03:32 +02:00
Damien Metzger
08f6d1a670
// Changed default value of checkbox in install
2013-04-25 08:41:31 +02:00
Rémi Gaillard
5a3c2aa5cf
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
Damien Metzger
cc2df5b237
// Switch iframe to https
2013-04-24 18:31:51 +03:00
gRoussac
1975755d8a
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
vAugagneur and François Gaillard
5967c6ebbe
//new addons url in install process
2013-04-24 16:39:04 +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
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
318a136553
[-] 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
697a305848
// small text change
2013-04-23 15:51:30 +02:00
Damien Metzger
8d4723247e
[-] FO : Fixed product comparator CSS
2013-04-23 15:35:21 +02:00
Damien Metzger
4162591e3e
// Fixed Chrome issue with cart rules
2013-04-23 15:30:17 +02:00
Damien Metzger
bec335441e
// Change link to the documentation in the installer
2013-04-23 14:57:24 +02:00
Damien Metzger
4be1bef203
// Remove "core" for the themes translations in the translation tool
2013-04-23 12:37:09 +02:00
Rémi Gaillard
ceddfdd8e6
// add static page to replace white page for exceptions in FO
2013-04-23 11:54:11 +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
Rémi Gaillard
75fed1a2cc
Merge pull request #398 from djfm/release
...
[*] TR : added russian installer tabs
2013-04-22 09:42:39 -07:00
djfm
da1f92b85b
[*] TR : added russian installer tabs
2013-04-22 18:37:28 +02:00
Rémi Gaillard
cd079f7a1a
Merge pull request #397 from djfm/release
...
[*] TR : Fixed wrong use of translation functions
2013-04-22 08:46:15 -07:00
djfm
0da1eb9e35
[*] TR : Fixed wrong use of translation functions in AdminTranslationsController
2013-04-22 17:24:47 +02:00
Damien Metzger
38adc4aaf3
Merge pull request #396 from djfm/installer_tabs
...
[*] TR : Added tab translations for installer languages
2013-04-22 07:01:40 -07:00
djfm
7912aba499
[*] TR : Added tab translations for installer languages
2013-04-22 15:40:25 +02:00
gRoussac
59ab9b63cf
[*] FO : one_phone_at_least should be set
2013-04-22 12:20:39 +02:00
gRoussac
90bf119624
[-] Fo : Remove additionnal space in phone field value
2013-04-22 12:20:23 +02:00
gRoussac
116df3b3fd
[-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO
2013-04-22 12:20:07 +02:00
Rémi Gaillard
16906d8590
[-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by
2013-04-19 15:48:18 +02:00
Rémi Gaillard
cc3f9212ac
// fix display of accessories for products without combinations
2013-04-19 15:15:25 +02:00
Rémi Gaillard
236675544b
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-04-19 15:14:51 +02:00
gRoussac
1a8ab7f68c
[-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop
2013-04-18 17:28:16 +02:00
Rémi Gaillard
38bdd421f7
// performance improve for ObjectModel::displayFieldName #PSCFV-8713
2013-04-18 17:12:05 +02:00
vAugagneur
803447b88d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 17:02:51 +02:00
vAugagneur
828ffb74ad
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
gRoussac
e22fe455b3
[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
2013-04-18 16:44:55 +02:00
vAugagneur
e9b8af0e97
[-] BO - fixed bug #PSCFV-8614
2013-04-18 15:14:37 +02:00
Rémi Gaillard