Grégoire Bélorgey
f21ddef3cc
Wrong link in CONTRIBUTING.md
2013-04-28 11:51:50 +02:00
Rémi Gaillard
9ec979cd29
// 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
Rémi Gaillard
41d93d1c66
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
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
Damien Metzger
9edf97ee52
// 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
231614290a
[-] 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
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
48ee7b417d
[-] 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
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
Damien Metzger
6251815c37
[-] 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
François Gaillard
6106066ef1
// 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
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
Rémi Gaillard
eb7cf3dbbb
// 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
17209a1725
// 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
Cédric Mouleyre
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
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
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
35d3d1d6c5
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
Rémi Gaillard
e827d3355d
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
Cédric Mouleyre
bf40d68098
Send mail with the shop in the context
2013-04-25 11:59:25 +03:00
vAugagneur
1280152db9
[-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404
2013-04-25 10:59:18 +02:00
djfm
f7f137fec1
[*] TR : Removed hard-coded dot in history.tpl
2013-04-25 10:48:29 +02:00
Cédric Mouleyre
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
djfm
8f406fcd1d
[*] TR : Improved English text of installer
2013-04-25 10:24:13 +02:00
gRoussac
125884d8c0
[-] BO : Fix bug witth shop address and no state in country
2013-04-25 10:12:23 +02:00
Damien Metzger
b2b17eb041
// Removed deprecated block for new installs
2013-04-25 09:03:32 +02:00
Damien Metzger
08f6d1a670
// Changed default value of checkbox in install
2013-04-25 08:41:31 +02:00
Rémi Gaillard
5a3c2aa5cf
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
Damien Metzger
cc2df5b237
// Switch iframe to https
2013-04-24 18:31:51 +03:00
gRoussac
1975755d8a
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
vAugagneur
5967c6ebbe
//new addons url in install process
2013-04-24 16:39:04 +02:00
François Gaillard
b5047051cd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
Damien Metzger
7cafc7bdf5
// Fixed warning in translations
2013-04-24 16:27:45 +02:00
Damien Metzger
feb1edc076
// Small translation fix
2013-04-24 15:45:58 +02:00
Damien Metzger
75dd65f207
// Small fix translations
2013-04-24 15:29:00 +02:00
Vincent Augagneur
ec45ea725f
Merge pull request #305 from Prestaworks/patch-9
...
[-]BO: Fixes issue with logo name.
2013-04-24 01:29:58 -07:00
Damien Metzger
83f132aa78
// Write theme translations... in the theme
2013-04-24 10:29:02 +02:00
Damien Metzger
d16f30f322
// Fix module translation in the core
2013-04-23 20:25:28 +02:00
Vincent Terenti
2d1a4ed180
// Fix translation behavior
2013-04-23 19:10:31 +02:00
vAugagneur
05fd9aeaae
[-] 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
cc18fd1de6
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +02:00
