Commit Graph
540 Commits
Author SHA1 Message Date
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 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Gregory Roussac ae117c2457 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 16:32:45 +01:00
gRoussac 51517e14a3 [-] FO : Fix #PSCFV-4885 for DNI field, states and postcode display 2013-01-04 16:31:05 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
PrestaEdit c811f6a835 [-] FO: remove WAHOU 2013-01-02 17:06:24 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Rémi Gaillard b3639c958b // oups.... 2012-12-31 12:20:26 +01:00
Rémi Gaillard 1edd663b11 // small fix 2012-12-31 12:17:42 +01:00
Rémi Gaillard 37f9d31c0a [-] FO: Fix retrocompatibility for modules and old themes 2012-12-31 12:06:28 +01:00
vAugagneur a35469768f //added translation 2012-12-28 09:27:12 +01:00
Gregory Roussac 3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
sLorenzini 304a95f2aa [-] FO : fixed bug Create account button - #PSCFV-6290 2012-12-27 11:27:02 +01:00
Gregory Roussac 4ed4905f1a [-] FO : Fixed message & entity 2012-12-26 18:58:17 +01:00
Damien Metzger 532583b3ab [-] FO : fixed usage of "&" in the order messages added by the customers 2012-12-26 12:50:34 +01:00
sLorenzini 30a477dd22 [-] FO: fixed bug FO - Libellés bouton radio mal calés - #PSCFV-6189 2012-12-20 11:26:51 +01:00
sLorenzini b20a206fbc [-] FO: fix bug Cannot register in Internet Explorer 8 because of javascript error - #PSCFV-5936 2012-12-20 09:55:00 +01:00
François Gaillard e87d0f9337 [-] FO : Mobile, data-ajax added on vouchers form 2012-12-18 17:48:29 +01:00
François Gaillard 02dd4b1d62 [-] FO : Mobile, bug fix (JS page reload on OPC) 2012-12-18 17:48:17 +01:00
François Gaillard 9a4f6a468f [-] FO : Mobile, data-ajax added on vouchers form 2012-12-18 17:45:04 +01:00
François Gaillard 363999c1d8 [-] FO : Mobile, bug fix (JS page reload on OPC) 2012-12-18 16:26:40 +01:00
vAugagneur f07b96f3d8 [-] FO : fixed bug #PSCFV-4878 - When disable show prices for default group don't show product accessories 2012-12-18 16:14:22 +01:00
vAugagneur a7ad0d9b30 revert modif on product.js 2012-12-17 18:05:22 +01:00
vAugagneur 367a442c08 //order opc js fix 2012-12-13 14:55:26 +01:00
vAugagneur df06579e02 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-13 09:41:32 +01:00
vAugagneur 668a7e35e7 [-] FO : small js fix on gift checkbox update on mobile 2012-12-13 09:41:20 +01:00
Damien Metzger e4d7a331fd // French translations 2012-12-13 09:32:04 +01:00
Rémi Gaillard d4ba675273 // fix js arg missing for translations in javascript 2012-12-12 19:07:29 +01:00
vAugagneur 0b95f0c30d //small fix 2012-12-12 18:43:11 +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
vAugagneur 7e95ccb76c //small fix #310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8 2012-12-12 16:24:35 +01:00
Vincent Augagneur 0cd93a517b Merge pull request #79 from PrestaEdit/PSCFV-3877
[-] FO : mobile template - states management
2012-12-12 03:34:09 -08:00
Jonathan Danse 9d5611f9fe [*] FO : mobile template - states management
Put "p" and "div" in the same selector
2012-12-12 12:30:10 +01:00
Vincent Augagneur 90c7578637 Merge pull request #74 from mcdado/patch-1
[-] FO : order-carrier more compatible with opc
2012-12-12 03:21:19 -08:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Vincent Augagneur 33fcc16467 Merge pull request #78 from montes/redution-typo
[-] FO : Fixed variable typo (redution instead of reduction in some places)
2012-12-12 00:53:00 -08:00
Damien Metzger 8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
François Gaillard 6173a98b58 [*] FO : Bug fix : h4 -> title_block 2012-12-10 11:38:48 +01:00
François Gaillard 312df517fb [*] FO : Cart vouchers style edited 2012-12-10 10:18:41 +01:00
PrestaEdit 5e563f2a48 [-] FO : mobile template - states management 2012-12-08 23:46:14 +01:00
montes 48d6b63d8e Fixed variable typo (redution instead of reduction in some places) 2012-12-07 23:24:41 +01:00
David Gasperoni 310dbaaf24 move header tag out of carrier block 2012-12-06 15:06:08 +01:00
David Gasperoni 3b9b19ec48 order-carrier more compatible with order-opc
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:56:06 +01:00
David Gasperoni 497968fd7a order-carrier more compatible with order-opc
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:52:14 +01:00
David Gasperoni 094e38206c order carrier more compatible with opc
The carriers' block didnt't have the 'opc-main-block' in the order-opc page.
2012-12-06 14:46:40 +01:00
Rémi Gaillard 0e0f6ee641 [-] FO: Fix cart summary ajax refreshment 2012-12-06 11:58:29 +01:00
sLorenzini 2191eec919 [-] FO: improvement on h4/h5 edits (id become class) 2012-12-06 10:06:56 +01:00
Sarah Lorenzini 8ddafa2568 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 11:03:16 +01:00
sLorenzini 4844914b0a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-05 10:59:47 +01:00
sLorenzini babded4d29 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 2012-12-05 10:42:26 +01:00