43a897436a
[-] 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
49b5d3ab02
[-] 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
459768d1ac
[-] 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
626009d157
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
bb59365004
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
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
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
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
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
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
0fed37eecd
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
83088a1905
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
f21ddef3cc
Wrong link in CONTRIBUTING.md
2013-04-28 11:51:50 +02:00
25b42744c8
Wrong link in CONTRIBUTING.md
2013-04-28 11:51:50 +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
4b52f6da2e
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
71b8e7cc33
// 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
1e6b8dd92b
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
60ea65d5fb
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
4c180685e1
[*] 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
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
9edf97ee52
// Fixed installer translation
2013-04-26 14:09:23 +02:00
ea6b4eaef8
// 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
0f08250e92
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
21aa134774
[-] 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
135689fc1f
// 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
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
48ee7b417d
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
a0867d3a92
[-] 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
d58377bf37
//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
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
6251815c37
[-] BO : Fixed display when you translate modules without theme selected
2013-04-25 17:47:07 +02:00
1921668596
[-] 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
Damien Metzger