c587934e25
[-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785
2013-04-29 11:16:26 +02:00
a06b42704e
[-] FO : fixed truncate and entities in the cart block #PSCFV-8870
2013-04-29 10:52:44 +02:00
903b17979c
[-] BO : fixed error message in language form #PSCFV-8890
2013-04-29 10:47:59 +02:00
795d7aa952
Merge pull request #259 from ldecoker/patch-3
...
[*] [MO] blocksupplier - missing uninstall method
2013-04-29 01:38:17 -07:00
ad3ba5342d
Merge pull request #291 from minicstudio/development
...
[*] MO : blocksearch - override buttons for ajax cart
2013-04-29 01:35:38 -07:00
ad17dbc700
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
83bc226508
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
5438a131b4
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
0fed37eecd
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
1a81461965
Replacing the default pinkish background with a grey one, and put the text in {color}
2013-04-28 11:13:46 +02:00
9ec979cd29
// small fix
2013-04-26 16:07:32 +02:00
83167fee67
Merge pull request #408 from djfm/development
...
[*] LO : Updated it & nl localization files
2013-04-26 06:33:36 -07:00
41d93d1c66
Merge pull request #407 from zecrazytux/fixracecondition
...
[-] Fixes a race condition
2013-04-26 06:24:56 -07:00
650fef032e
[*] LO : Updated it & nl localization files
2013-04-26 15:20:19 +02:00
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
9edf97ee52
// Fixed installer translation
2013-04-26 14:09:23 +02:00
0c71bda9e6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-26 12:19:25 +02:00
231614290a
[-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values
2013-04-26 12:19:20 +02:00
821c8c0f3f
// small fix on php-cli installer
2013-04-26 11:54:05 +02:00
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
48ee7b417d
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
8b590af1c7
//small css fix in installer
2013-04-26 09:44:51 +02:00
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
6251815c37
[-] BO : Fixed display when you translate modules without theme selected
2013-04-25 17:47:07 +02:00
829a0b482a
// Fix homeslider upgrade
2013-04-25 17:21:19 +02:00
6106066ef1
// 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
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
eb7cf3dbbb
// 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
17209a1725
// 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
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
cde13e7707
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
35d3d1d6c5
[-] 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
bf40d68098
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
f7f137fec1
[*] 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
8f406fcd1d
[*] 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
b2b17eb041
// 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
5a3c2aa5cf
// 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
1975755d8a
[-] 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
b5047051cd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
Damien Metzger