bc87fc478c
// Fix homeslider upgrade
2013-04-25 17:21:19 +02:00
6106066ef1
// Release branch merged
2013-04-25 17:00:56 +02:00
8d735b333f
// Release branch merged
2013-04-25 17:00:56 +02:00
056709f2dd
// CHANGELOG 1.5.4.1
2013-04-25 16:59:40 +02:00
062759808e
// CHANGELOG 1.5.4.1
2013-04-25 16:59:40 +02:00
f0da3fa2ae
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
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
eb7cf3dbbb
// delete char
2013-04-25 14:20:27 +02:00
a56e4fa62d
// delete char
2013-04-25 14:20:27 +02:00
5ac2a0d946
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-04-25 11:41:09 +02:00
8f23902023
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-04-25 11:41:09 +02:00
17209a1725
// update default languages pack
2013-04-25 11:40:54 +02:00
7f372216cc
// update default languages pack
2013-04-25 11:40:54 +02:00
907047165b
// Added english pack in the installer
2013-04-25 11:29:35 +02:00
0c52150021
// Added english pack in the installer
2013-04-25 11:29:35 +02:00
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
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
cde13e7707
Merge pull request #403 from MrManchot/patch-4
...
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07:00
36b0eae84f
Merge pull request #403 from MrManchot/patch-4
...
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07:00
45f54ce08d
Merge pull request #402 from djfm/release
...
[*] TR : Improved English text of installer
2013-04-25 02:17:35 -07:00
2ba2336df4
Merge pull request #402 from djfm/release
...
[*] TR : Improved English text of installer
2013-04-25 02:17:35 -07:00
35d3d1d6c5
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
1d8c2f84c3
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
e827d3355d
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
2b23268bec
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
bf40d68098
Send mail with the shop in the context
2013-04-25 11:59:25 +03:00
a7986efda1
Send mail with the shop in the context
2013-04-25 11:59:25 +03:00
1280152db9
[-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404
2013-04-25 10:59:18 +02:00
ac9a5c5a41
[-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404
2013-04-25 10:59:18 +02:00
f7f137fec1
[*] TR : Removed hard-coded dot in history.tpl
2013-04-25 10:48:29 +02:00
d0f230da39
[*] TR : Removed hard-coded dot in history.tpl
2013-04-25 10:48:29 +02:00
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
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
8f406fcd1d
[*] TR : Improved English text of installer
2013-04-25 10:24:13 +02:00
e664335f4d
[*] TR : Improved English text of installer
2013-04-25 10:24:13 +02:00
125884d8c0
[-] BO : Fix bug witth shop address and no state in country
2013-04-25 10:12:23 +02:00
91ab0362db
[-] BO : Fix bug witth shop address and no state in country
2013-04-25 10:12:23 +02:00
b2b17eb041
// Removed deprecated block for new installs
2013-04-25 09:03:32 +02:00
7a76b8b6a0
// Removed deprecated block for new installs
2013-04-25 09:03:32 +02:00
08f6d1a670
// Changed default value of checkbox in install
2013-04-25 08:41:31 +02:00
0e9a4a8272
// Changed default value of checkbox in install
2013-04-25 08:41:31 +02:00
5a3c2aa5cf
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
9a326bd844
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
cc2df5b237
// Switch iframe to https
2013-04-24 18:31:51 +03:00
c6710bf26f
// Switch iframe to https
2013-04-24 18:31:51 +03:00
1975755d8a
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
7081e6d0d0
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
5967c6ebbe
//new addons url in install process
2013-04-24 16:39:04 +02:00
2c3f2eb1da
//new addons url in install process
2013-04-24 16:39:04 +02:00
b5047051cd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
Damien Metzger