djfm
f7f137fec1
[*] TR : Removed hard-coded dot in history.tpl
2013-04-25 10:48:29 +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
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
François Gaillard
b5047051cd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +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
vAugagneur
05fd9aeaae
[-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back
2013-04-23 17:41:29 +02:00
vAugagneur
cc18fd1de6
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +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
vAugagneur
0156ddc30a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 14:22:45 +02:00
vAugagneur
e363dc8759
Merge Pull Request #167 - Thanks @Zeyckler
2013-04-23 14:22:40 +02:00
Vincent Augagneur
d1c7f9c012
Merge pull request #390 from ccauw/patch-7
...
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07: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
vAugagneur
38eb16eb48
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
François Gaillard
f1e34c20b8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 11:39:14 +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
vAugagneur
e466ede051
Merge Pull request #67 - Thanks @Ha99y
2013-04-23 10:02:29 +02:00
vAugagneur
5b7da618b5
Merge Pull Request #21 - thanks @Caleydon
2013-04-23 09:34:24 +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
vAugagneur
5fb2bb9ee2
[*] BO : added new button on manufacturers view
2013-04-22 14:56:59 +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
gRoussac
34688d6933
[*] FO : one_phone_at_least should be set
2013-04-22 12:18:26 +02:00
gRoussac
4bf41c590b
[-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state
2013-04-22 12:09:35 +02:00
vAugagneur
31e7c6a08e
Merged Pull request #355 - thanks to @bibendi
2013-04-22 12:06:19 +02:00
Damien Metzger
141772725b
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +02:00
djfm