Edouard Gaulué
fdb931e3e8
[-] BO : don't show unecessary tpl module translations - complience with documentation
2013-05-02 18:46:13 +02:00
Rémi Gaillard
46f7922a8f
// id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity
2013-04-30 12:33:52 +02:00
sLorenzini
e0a16977ef
[-] FO: improve some css for RTL language
2013-04-30 11:34:13 +02:00
sLorenzini
4d961564f7
[-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891)
2013-04-30 11:23:18 +02:00
sLorenzini
00bd78e843
// BO: Improve product display on supplier page
2013-04-30 11:09:08 +02:00
Gregory Roussac
cb29f20f1e
// remove unused .show()
2013-04-29 23:14:57 +02:00
Gregory Roussac
1e4e8d6a13
[-] FO : Jqzoom must be enabled to add class jqzoom
2013-04-29 22:05:01 +02:00
Gregory Roussac
d618c8618a
//norms
2013-04-29 21:55:30 +02:00
Gregory Roussac
a8698d9e59
[-] Bo : Admin login loop under Firefox
2013-04-29 21:54:26 +02:00
Rémi Gaillard
9fc4bce500
[-] Core: Fix specific prices if they are configured to count quantity per product and not per combination
2013-04-29 18:49:42 +02:00
Damien Metzger
548ef7691a
// BO : Changed product display on supplier page
2013-04-29 18:34:34 +02:00
Dragan Skrbic
d00ccdf306
// Fixed image import
2013-04-29 18:07:42 +02:00
Damien Metzger
4c259393f5
// Fixed case which caused duplicated translation #PSCFV-8936
2013-04-29 17:45:45 +02:00
Damien Metzger
989b19d94a
[-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181
2013-04-29 17:45:45 +02:00
gRoussac
88adba8e5b
// typo
2013-04-29 17:19:07 +02:00
gRoussac
78747eedc2
// rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107
2013-04-29 17:12:17 +02:00
gRoussac
9ce2249883
// revert from commit 5f6d0614df
2013-04-29 17:03:41 +02:00
vAugagneur
716b79b8c6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-29 16:21:51 +02:00
vAugagneur
acccaf5fbc
Merged Pull Request #242 - thanks @andskiba
2013-04-29 16:21:33 +02:00
Rémi Gaillard
dc7f1ceddf
[-] 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
d0f6f2b6c7
Merge pull request #389 from ccauw/patch-5
...
[*] BO : Add block "override_form_extra"
2013-04-29 03:11:40 -07:00
Damien Metzger
527f87a691
// Fixed directory creation in translation #PSCFV-8212
2013-04-29 12:08:45 +02:00
Damien Metzger
3b5591dc55
[-] FO : removed misleading label on the shipping total #PSCFV-8556
2013-04-29 11:35:47 +02:00
Damien Metzger
c587934e25
[-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785
2013-04-29 11:16:26 +02:00
Damien Metzger
a06b42704e
[-] FO : fixed truncate and entities in the cart block #PSCFV-8870
2013-04-29 10:52:44 +02:00
Damien Metzger
903b17979c
[-] BO : fixed error message in language form #PSCFV-8890
2013-04-29 10:47:59 +02:00
Vincent Augagneur
795d7aa952
Merge pull request #259 from ldecoker/patch-3
...
[*] [MO] blocksupplier - missing uninstall method
2013-04-29 01:38:17 -07:00
Vincent Augagneur
ad3ba5342d
Merge pull request #291 from minicstudio/development
...
[*] MO : blocksearch - override buttons for ajax cart
2013-04-29 01:35:38 -07:00
Vincent Augagneur
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
Vincent Augagneur
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
Vincent Augagneur
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
Grégoire Bélorgey
0fed37eecd
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
Grégoire Bélorgey
1a81461965
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
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
1.5.4.1
2013-04-25 16:59:40 +02:00