Commit Graph

1698 Commits

Author SHA1 Message Date
gRoussac b994136939 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
vAugagneur bbad9b7f61 Merge branch 'release' into development 2013-03-08 14:54:31 +01:00
vAugagneur fd0e0618ab Merge branch 'release' into development 2013-03-08 14:54:31 +01:00
Damien Metzger 6d98b9a6ac // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
Damien Metzger 7ec0f0e391 // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
Francois Gaillard 80331d2348 Merge branch 'release' into development 2013-03-07 18:11:34 +01:00
François Gaillard 8e357caaa1 Merge branch 'release' into development 2013-03-07 18:11:34 +01:00
Francois Gaillard 55caa6f0cb [-] MO : Bug fix : AdminStores, smarty escape htmlall 2013-03-07 17:38:00 +01:00
François Gaillard 7467fa17da [-] MO : Bug fix : AdminStores, smarty escape htmlall 2013-03-07 17:38:00 +01:00
gRoussac 6f6a58e8f3 [*] Bo : Fix #PSCFV-7989 red quantity > 1 on orders again 2013-03-04 11:26:19 +01:00
gRoussac a68cea058f [*] Bo : Fix #PSCFV-7989 red quantity > 1 on orders again 2013-03-04 11:26:19 +01:00
gRoussac ddcd63b9cc [*] FO : Fix #PSCFV-7989 red quantity > 1 on orders 2013-03-04 10:23:03 +01:00
gRoussac 96b1528560 [*] FO : Fix #PSCFV-7989 red quantity > 1 on orders 2013-03-04 10:23:03 +01:00
gRoussac 42bb2a506c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-03-01 17:18:07 +01:00
gRoussac a37412e398 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-03-01 17:18:07 +01:00
vAugagneur 8af272f6e3 [-] BO : fixed bug when save image shop association 2013-03-01 17:17:17 +01:00
vAugagneur ca53094d34 [-] BO : fixed bug when save image shop association 2013-03-01 17:17:17 +01:00
gRoussac e385e2d19c [-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program 2013-03-01 17:16:42 +01:00
gRoussac e9d759ae03 [-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program 2013-03-01 17:16:42 +01:00
sLorenzini ccc77168a2 [-] FO: fixed bug two little coding error - #PSCFV-7982 2013-03-01 15:23:36 +01:00
sLorenzini 8b4e42ef3c [-] FO: fixed bug two little coding error - #PSCFV-7982 2013-03-01 15:23:36 +01:00
Damien Metzger 8885c3f642 [+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order 2013-02-28 15:23:21 +01:00
Damien Metzger 8b2e9fb08e [+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order 2013-02-28 15:23:21 +01:00
Rémi Gaillard 499b81ae55 [-] BO: Fix module listing with addons module with default currency not on the xml #PSCFV-8005 2013-02-26 10:45:22 +01:00
Rémi Gaillard e3a47635aa [-] BO: Fix module listing with addons module with default currency not on the xml #PSCFV-8005 2013-02-26 10:45:22 +01:00
Rémi Gaillard 95f43d3ac6 [-] BO: Fix #PSCFV-7995 countries/groups/currencies refreshment when selecting a shop in specific price form 2013-02-25 18:45:28 +01:00
Rémi Gaillard 0e0762cee7 [-] BO: Fix #PSCFV-7995 countries/groups/currencies refreshment when selecting a shop in specific price form 2013-02-25 18:45:28 +01:00
Rémi Gaillard 31e3882d82 [-] BO: pagination was missing on tax rules listing 2013-02-25 14:50:23 +01:00
Rémi Gaillard 679b45b5bd [-] BO: pagination was missing on tax rules listing 2013-02-25 14:50:23 +01:00
Rémi Gaillard 0a716e03c5 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
Rémi Gaillard 0e38d44a21 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
Damien Metzger 43e52b69ac [-] BO : automatic conversion of , into . in cart rules #PSCFV-7430 2013-02-21 15:40:24 +01:00
Damien Metzger 2ac8f92880 [-] BO : automatic conversion of , into . in cart rules #PSCFV-7430 2013-02-21 15:40:24 +01:00
sLorenzini 755573184c [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini 3f22df2cfb [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini ae9b78dc0f [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini 602c11079d [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini 4ce88468df [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
sLorenzini 110afe7b69 [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
Rémi Gaillard 3eeca3537a // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard 702679a3a0 // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard 96b86a79f3 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop 2013-02-18 15:29:48 +01:00
Rémi Gaillard 08f5a01bd8 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop 2013-02-18 15:29:48 +01:00
Rémi Gaillard d473c04ebe [*] BO: store filter by category in admin products 2013-02-14 14:51:51 +01:00
Rémi Gaillard f137de9613 [*] BO: store filter by category in admin products 2013-02-14 14:51:51 +01:00
vAugagneur d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
vAugagneur fa34534654 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
gRoussac 3e9d0dda55 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00