Damien Metzger
ea6b4eaef8
// Fixed installer translation
2013-04-26 14:09:23 +02:00
vAugagneur
0f08250e92
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-26 12:19:25 +02:00
vAugagneur
21aa134774
[-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values
2013-04-26 12:19:20 +02:00
Rémi Gaillard
135689fc1f
// small fix on php-cli installer
2013-04-26 11:54:05 +02:00
vAugagneur
9983b1723f
[-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary
2013-04-26 10:30:17 +02:00
vAugagneur
a0867d3a92
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
vAugagneur
d58377bf37
//small css fix in installer
2013-04-26 09:44:51 +02:00
gRoussac
23239ef680
[-] BO : Fix bug #PSCFI-7141, wrong quantity and sales number in Product Sales, thankx to @Tuan Tran
2013-04-25 18:02:33 +02:00
Damien Metzger
1921668596
[-] BO : Fixed display when you translate modules without theme selected
2013-04-25 17:47:07 +02:00
Damien Metzger
bc87fc478c
// Fix homeslider upgrade
2013-04-25 17:21:19 +02:00
Francois Gaillard
8d735b333f
// Release branch merged
2013-04-25 17:00:56 +02:00
Francois Gaillard
062759808e
// CHANGELOG 1.5.4.1
2013-04-25 16:59:40 +02:00
Vincent Augagneur
4b8b7f34d0
Merge pull request #404 from MrManchot/patch-5
...
Module newsletter : Send mail with the shop in the context
2013-04-25 05:48:24 -07:00
Rémi Gaillard
a56e4fa62d
// delete char
2013-04-25 14:20:27 +02:00
Rémi Gaillard
8f23902023
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-04-25 11:41:09 +02:00
Rémi Gaillard
7f372216cc
// update default languages pack
2013-04-25 11:40:54 +02:00
Damien Metzger
0c52150021
// Added english pack in the installer
2013-04-25 11:29:35 +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
Damien Metzger
2ba2336df4
Merge pull request #402 from djfm/release
...
[*] TR : Improved English text of installer
2013-04-25 02:17:35 -07:00
Damien Metzger
1d8c2f84c3
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
Rémi Gaillard
2b23268bec
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
Cédric Mouleyre
a7986efda1
Send mail with the shop in the context
2013-04-25 11:59:25 +03:00
vAugagneur
ac9a5c5a41
[-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404
2013-04-25 10:59:18 +02:00
djfm
d0f230da39
[*] TR : Removed hard-coded dot in history.tpl
2013-04-25 10:48:29 +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
djfm
e664335f4d
[*] TR : Improved English text of installer
2013-04-25 10:24:13 +02:00
gRoussac
91ab0362db
[-] BO : Fix bug witth shop address and no state in country
2013-04-25 10:12:23 +02:00
Damien Metzger
7a76b8b6a0
// Removed deprecated block for new installs
2013-04-25 09:03:32 +02:00
Damien Metzger
0e9a4a8272
// Changed default value of checkbox in install
2013-04-25 08:41:31 +02:00
Rémi Gaillard
9a326bd844
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
Damien Metzger
c6710bf26f
// Switch iframe to https
2013-04-24 18:31:51 +03:00
gRoussac
7081e6d0d0
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
Francois Gaillard
2c3f2eb1da
//new addons url in install process
2013-04-24 16:39:04 +02:00
Francois Gaillard
50d52baa7b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +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
vAugagneur
3607c2264f
[-] 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
c7bbf74913
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +02:00
Damien Metzger
6f96f0ac9a
[-] 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
913d0d9711
// small text change
2013-04-23 15:51:30 +02:00
Damien Metzger
9395d95548
[-] FO : Fixed product comparator CSS
2013-04-23 15:35:21 +02:00
Damien Metzger
c191b36fb6
// Fixed Chrome issue with cart rules
2013-04-23 15:30:17 +02:00
Damien Metzger
23dacfd754
// Change link to the documentation in the installer
2013-04-23 14:57:24 +02:00
vAugagneur
b84b44a44c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 14:22:45 +02:00