Commit Graph

18638 Commits

Author SHA1 Message Date
gRoussac
bd0e467c97 // small css fix 2013-04-12 16:51:05 +02:00
gRoussac
60a787e4cb // small css fix 2013-04-12 16:51:05 +02:00
gRoussac
0ba0a25f3d [-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule 2013-04-12 16:45:54 +02:00
gRoussac
29a919c24f [-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule 2013-04-12 16:45:54 +02:00
Daniel
7f5a78a120 Update AdminThemesController.php 2013-04-12 18:51:50 +08:00
Daniel
20901e5c85 Update AdminThemesController.php 2013-04-12 18:51:50 +08:00
gRoussac
f209d5a669 [-] Fo : Fix undefined var in cart-summary when updating id_address_delivery 2013-04-12 12:34:37 +02:00
gRoussac
b9ca25d3e6 [-] Fo : Fix undefined var in cart-summary when updating id_address_delivery 2013-04-12 12:34:37 +02:00
gRoussac
a73c09ab4c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-12 12:04:21 +02:00
gRoussac
b7546a6ad2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-12 12:04:21 +02:00
gRoussac
fcce2d2737 [-] FO : Fix login cookie issues 2013-04-12 12:03:16 +02:00
gRoussac
5b48649242 [-] FO : Fix login cookie issues 2013-04-12 12:03:16 +02:00
vAugagneur
d48d33fc43 //Merge Pull request #319 2013-04-12 11:55:57 +02:00
vAugagneur
03262debd4 //Merge Pull request #319 2013-04-12 11:55:57 +02:00
sLorenzini
9060661cef [-] FO: fixed bug #PSCFV-3238 - compareController typo 2013-04-12 11:51:38 +02:00
sLorenzini
7e3640e3b7 [-] FO: fixed bug #PSCFV-3238 - compareController typo 2013-04-12 11:51:38 +02:00
vAugagneur
37296f9c7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-12 11:46:44 +02:00
vAugagneur
329ff2fe39 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-12 11:46:44 +02:00
vAugagneur
f0209dd447 //small spellchecking 2013-04-12 11:46:38 +02:00
vAugagneur
846d6c489d //small spellchecking 2013-04-12 11:46:38 +02:00
sLorenzini
1ebd625563 [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
sLorenzini
a7d61c551e [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
Vincent Augagneur
8609f07749 Merge pull request #346 from pxls/patch-1
[-] FO : bad variable used for free product text
2013-04-12 02:42:24 -07:00
Vincent Augagneur
a89c8964b5 Merge pull request #346 from pxls/patch-1
[-] FO : bad variable used for free product text
2013-04-12 02:42:24 -07:00
Rémi Gaillard
305cf4dd9c [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
Rémi Gaillard
4a1892843a [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
Vincent Augagneur
e8f3fcf581 Merge pull request #371 from PrestaEdit/patch-26
[-] Config: juste more beautifull :)
2013-04-12 01:50:54 -07:00
Vincent Augagneur
f8dd047f99 Merge pull request #371 from PrestaEdit/patch-26
[-] Config: juste more beautifull :)
2013-04-12 01:50:54 -07:00
Rémi Gaillard
a632965b0d // fix for commit 3cbd8444d6 2013-04-12 10:49:30 +02:00
Rémi Gaillard
f30749449f // fix for commit 3cbd8444d6 2013-04-12 10:49:30 +02:00
gRoussac
08c53d77b2 [-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10) 2013-04-11 18:53:10 +02:00
gRoussac
30fd9ac6e0 [-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10) 2013-04-11 18:53:10 +02:00
Rémi Gaillard
3cbd8444d6 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00
Rémi Gaillard
8d06ff3044 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00
vAugagneur
714b57f225 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 17:51:34 +02:00
vAugagneur
94d6b597a2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 17:51:34 +02:00
vAugagneur
d827879f8b //change the default color (#db3484) 2013-04-11 17:51:28 +02:00
vAugagneur
0786cf617f //change the default color (#db3484) 2013-04-11 17:51:28 +02:00
gRoussac
61557f2fd0 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading 2013-04-11 17:34:15 +02:00
gRoussac
6d869cc804 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading 2013-04-11 17:34:15 +02:00
PrestaEdit
60e77597ac [-] Remove / 2013-04-11 18:18:15 +03:00
PrestaEdit
8070739347 [-] Remove / 2013-04-11 18:18:15 +03:00
Vincent Augagneur
239dcb0179 Merge pull request #377 from PrestaEdit/patch-28
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
Vincent Augagneur
710783c066 Merge pull request #377 from PrestaEdit/patch-28
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
Vincent Augagneur
0a0f28ee21 Merge pull request #375 from MrManchot/patch-1
Update blocknewsletter.php
2013-04-11 07:35:04 -07:00
Vincent Augagneur
590b0a6576 Merge pull request #375 from MrManchot/patch-1
Update blocknewsletter.php
2013-04-11 07:35:04 -07:00
vAugagneur
f9225cb8c2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 16:31:48 +02:00
vAugagneur
a2f137f9de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 16:31:48 +02:00
vAugagneur
b1dc638120 //removed commented code 2013-04-11 16:31:43 +02:00
vAugagneur
2b575e0c96 //removed commented code 2013-04-11 16:31:43 +02:00