Rémi Gaillard
71b8e7cc33
// small fix
2013-04-26 16:07:32 +02:00
Damien Metzger
83167fee67
Merge pull request #408 from djfm/development
...
[*] LO : Updated it & nl localization files
2013-04-26 06:33:36 -07:00
Damien Metzger
1e6b8dd92b
Merge pull request #408 from djfm/development
...
[*] LO : Updated it & nl localization files
2013-04-26 06:33:36 -07:00
Rémi Gaillard
41d93d1c66
Merge pull request #407 from zecrazytux/fixracecondition
...
[-] Fixes a race condition
2013-04-26 06:24:56 -07:00
Rémi Gaillard
60ea65d5fb
Merge pull request #407 from zecrazytux/fixracecondition
...
[-] Fixes a race condition
2013-04-26 06:24:56 -07:00
djfm
650fef032e
[*] LO : Updated it & nl localization files
2013-04-26 15:20:19 +02:00
djfm
4c180685e1
[*] LO : Updated it & nl localization files
2013-04-26 15:20:19 +02:00
Sébastien Bocahu
fd88ac76be
[-] Fixes a race condition
...
Fixes a race condition leading to file coruption and PHP crashes when
writing the cache index file.
Handles concurrency properly by using a temporary file and an atomic
rename() instead of file_put_contents(), which is not atomic, on a
file which is potentially accessed by many processes at the same time
2013-04-26 14:28:01 +02:00
Sébastien Bocahu
2ac6e52c9f
[-] Fixes a race condition
...
Fixes a race condition leading to file coruption and PHP crashes when
writing the cache index file.
Handles concurrency properly by using a temporary file and an atomic
rename() instead of file_put_contents(), which is not atomic, on a
file which is potentially accessed by many processes at the same time
2013-04-26 14:28:01 +02:00
Damien Metzger
9edf97ee52
// Fixed installer translation
2013-04-26 14:09:23 +02:00
Damien Metzger
ea6b4eaef8
// Fixed installer translation
2013-04-26 14:09:23 +02:00
vAugagneur
0c71bda9e6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-26 12:19:25 +02:00
vAugagneur
0f08250e92
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-26 12:19:25 +02:00
vAugagneur
231614290a
[-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values
2013-04-26 12:19:20 +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
821c8c0f3f
// small fix on php-cli installer
2013-04-26 11:54:05 +02:00
Rémi Gaillard
135689fc1f
// small fix on php-cli installer
2013-04-26 11:54:05 +02:00
vAugagneur
fc14c79521
[-] 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
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
48ee7b417d
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
vAugagneur
a0867d3a92
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
vAugagneur
8b590af1c7
//small css fix in installer
2013-04-26 09:44:51 +02:00
vAugagneur
d58377bf37
//small css fix in installer
2013-04-26 09:44:51 +02:00
gRoussac
1dabfcef6a
[-] 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
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
6251815c37
[-] BO : Fixed display when you translate modules without theme selected
2013-04-25 17:47:07 +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
829a0b482a
// Fix homeslider upgrade
2013-04-25 17:21:19 +02:00
Damien Metzger
bc87fc478c
// Fix homeslider upgrade
2013-04-25 17:21:19 +02:00
Otto Nascarella
a994c93dee
Progressive JPEG
...
https://plus.google.com/+PaulIrish/posts/5KzxfS9nNEZ
2013-04-25 12:18:50 -03:00
François Gaillard
6106066ef1
// Release branch merged
2013-04-25 17:00:56 +02:00
Francois Gaillard
8d735b333f
// Release branch merged
2013-04-25 17:00:56 +02:00
François Gaillard
056709f2dd
// CHANGELOG 1.5.4.1
2013-04-25 16:59:40 +02:00
Francois Gaillard
062759808e
// CHANGELOG 1.5.4.1
2013-04-25 16:59:40 +02:00
Vincent Augagneur
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
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
eb7cf3dbbb
// delete char
2013-04-25 14:20:27 +02:00
Rémi Gaillard
a56e4fa62d
// 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
8f23902023
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
Rémi Gaillard
7f372216cc
// 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
Damien Metzger
0c52150021
// 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
Cédric Mouleyre and Rémi Gaillard
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
cde13e7707
Merge pull request #403 from MrManchot/patch-4
...
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07: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
45f54ce08d
Merge pull request #402 from djfm/release
...
[*] TR : Improved English text of installer
2013-04-25 02:17:35 -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
Rémi Gaillard