Rémi Gaillard
bfc8a0ad02
[-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen
2013-04-29 13:47:46 +02:00
Vincent Augagneur
e036d47d13
Merge pull request #389 from ccauw/patch-5
...
[*] BO : Add block "override_form_extra"
2013-04-29 03:11:40 -07:00
Damien Metzger
94090e2a39
// Fixed directory creation in translation #PSCFV-8212
2013-04-29 12:08:45 +02:00
Damien Metzger
71c3f2e71f
[-] FO : removed misleading label on the shipping total #PSCFV-8556
2013-04-29 11:35:47 +02:00
Damien Metzger
43a897436a
[-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785
2013-04-29 11:16:26 +02:00
Damien Metzger
49b5d3ab02
[-] FO : fixed truncate and entities in the cart block #PSCFV-8870
2013-04-29 10:52:44 +02:00
Damien Metzger
459768d1ac
[-] BO : fixed error message in language form #PSCFV-8890
2013-04-29 10:47:59 +02:00
Vincent Augagneur
626009d157
Merge pull request #259 from ldecoker/patch-3
...
[*] [MO] blocksupplier - missing uninstall method
2013-04-29 01:38:17 -07:00
Vincent Augagneur
bb59365004
Merge pull request #291 from minicstudio/development
...
[*] MO : blocksearch - override buttons for ajax cart
2013-04-29 01:35:38 -07:00
Vincent Augagneur
218a76c443
Merge pull request #310 from Patanock/patch-5
...
[*] BO: Customer and carrier need to be send to the hook
2013-04-29 01:31:16 -07:00
Vincent Augagneur
e4323f18f4
Merge pull request #411 from MyBB-Services/dev/gb/mailcolor
...
[*] Mails : delete a hard-coded pink background
2013-04-29 01:28:19 -07:00
Vincent Augagneur
fe05e1cc39
Merge pull request #330 from DrySs/patch-5
...
[-] FO: CMS link to conditions should not be in SSL
2013-04-29 01:22:21 -07:00
Grégoire Bélorgey
83088a1905
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
Grégoire Bélorgey
4b52f6da2e
Replacing the default pinkish background with a grey one, and put the text in {color}
2013-04-28 11:13:46 +02:00
Rémi Gaillard
71b8e7cc33
// small fix
2013-04-26 16:07:32 +02: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
60ea65d5fb
Merge pull request #407 from zecrazytux/fixracecondition
...
[-] Fixes a race condition
2013-04-26 06:24:56 -07:00
djfm
4c180685e1
[*] LO : Updated it & nl localization files
2013-04-26 15:20:19 +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
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 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
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
Rémi Gaillard