Commit Graph

2946 Commits

Author SHA1 Message Date
vAugagneur 9a933d8818 //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur 8e43f1e38f //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur 71e863c6f5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur 5f490483d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur ffbc326454 //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
vAugagneur cbb87e4bbc //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
Damien Metzger 886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Damien Metzger 4efaad145f [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
vAugagneur 7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
vAugagneur 61371b5b4c //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
sLorenzini c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
sLorenzini 6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
vAugagneur d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
vAugagneur 796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
Vincent Augagneur 4192e58888 Merge pull request #150 from djfm/development
//Changed English strings using the translationsenglish module.
2013-01-04 08:06:15 -08:00
Vincent Augagneur 1f9a3109b9 Merge pull request #150 from djfm/development
//Changed English strings using the translationsenglish module.
2013-01-04 08:06:15 -08:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard e7d5985d41 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
Rémi Gaillard d7694b5900 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Mats Rynge 230cd38839 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
Mats Rynge f2dbf94973 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
Damien Metzger 7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Gregory Roussac dbb8a9f2e0 [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
Damien Metzger 62e70850fb [-] BO : Fixed warning in helper #PSCFV-6183 2012-12-18 15:47:09 +01:00
Damien Metzger 96d6abe2af [-] BO : Fixed warning in helper #PSCFV-6183 2012-12-18 15:47:09 +01:00
vAugagneur 912971263b [-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly 2012-12-14 16:12:25 +01:00
vAugagneur c841ddfcf5 [-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly 2012-12-14 16:12:25 +01:00
Damien Metzger d930c479fb [-] BO : added check on a key in the helper list #PSCFV-6137 2012-12-14 10:13:28 +01:00
Damien Metzger 630b41ec71 [-] BO : added check on a key in the helper list #PSCFV-6137 2012-12-14 10:13:28 +01:00
Damien Metzger 6e2ebf1c07 // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger ee19d3d62b // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
Damien Metzger 2bf6b3a82e // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur 06a3e4709b [*] BO : moved sample csv file 2012-12-13 09:16:03 +01:00
vAugagneur c6f9d13800 [*] BO : moved sample csv file 2012-12-13 09:16:03 +01:00
vAugagneur a100b1d220 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag 2012-12-12 17:38:31 +01:00
vAugagneur cd0eb0c6a4 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag 2012-12-12 17:38:31 +01:00
Vincent Augagneur ebff913250 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
Vincent Augagneur 6445fea198 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
vAugagneur 42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00