gRoussac
88adba8e5b
// typo
2013-04-29 17:19:07 +02:00
gRoussac
d2d4b68f7c
// 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
140b9b2bba
// 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
gRoussac
7afdb08a56
// 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
7b1c50b97f
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
vAugagneur
f58c8e7a93
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
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
d0f6f2b6c7
Merge pull request #389 from ccauw/patch-5
...
[*] BO : Add block "override_form_extra"
2013-04-29 03:11:40 -07: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
527f87a691
// Fixed directory creation in translation #PSCFV-8212
2013-04-29 12:08:45 +02:00
Damien Metzger
94090e2a39
// 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
71c3f2e71f
[-] 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
43a897436a
[-] 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
49b5d3ab02
[-] 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
Damien Metzger
459768d1ac
[-] 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
626009d157
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
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
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
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
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
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
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
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
0fed37eecd
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02: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
f21ddef3cc
Wrong link in CONTRIBUTING.md
2013-04-28 11:51:50 +02:00
Grégoire Bélorgey
25b42744c8
Wrong link in CONTRIBUTING.md
2013-04-28 11:51:50 +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
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
9ec979cd29
// small fix
2013-04-26 16:07:32 +02:00
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
gRoussac