Commit Graph

3326 Commits

Author SHA1 Message Date
Damien Metzger 3820a011cb // Reduced localization form size 2013-03-20 18:10:53 +01:00
Damien Metzger 68be65e60f // Reduced localization form size 2013-03-20 18:10:53 +01:00
vAugagneur b70497189d [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur b95b5861ef [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
Rémi Gaillard e4890b629d // small fix for value of default refund displayed 2013-03-19 13:50:21 +01:00
Rémi Gaillard 0a54da23d8 // small fix for value of default refund displayed 2013-03-19 13:50:21 +01:00
gRoussac 1b7a914008 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
gRoussac 39b120bbb4 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
vAugagneur e9c618e55b //small fix when click on install button on tab module list 2013-03-18 15:27:56 +01:00
vAugagneur 5b2465e9bb //small fix when click on install button on tab module list 2013-03-18 15:27:56 +01:00
Rémi Gaillard f6674417cb [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
Rémi Gaillard f483feb53d [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
vAugagneur f4537c022f //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur 905eca2fd0 //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
François Gaillard e08945de6b Merge branch 'release' into development 2013-03-14 16:39:47 +01:00
Francois Gaillard 7f3678a776 Merge branch 'release' into development 2013-03-14 16:39:47 +01:00
Rémi Gaillard 987977ecbb [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard 0da58b215c [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
vAugagneur 149407f72d //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
vAugagneur ee53bc4aea //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
gRoussac a6dbe24d28 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +01:00
gRoussac 3b091fad98 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +01:00
gRoussac b994136939 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
gRoussac 7591efd6d6 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
gRoussac dfa3e0fcb0 [-] BO : Fix bug #PSCFV-7468 required phone in address creation 2013-03-11 17:39:13 +01:00
gRoussac d73fcdf412 [-] BO : Fix bug #PSCFV-7468 required phone in address creation 2013-03-11 17:39:13 +01:00
vAugagneur 5f47b81211 //replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__ 2013-03-11 15:10:22 +01:00
vAugagneur 0688061b0a //replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__ 2013-03-11 15:10:22 +01:00
Damien Metzger a33c6ff54b // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Damien Metzger 7bd2bb9cb6 // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
vAugagneur fd0e0618ab Merge branch 'release' into development 2013-03-08 14:54:31 +01:00
vAugagneur bbad9b7f61 Merge branch 'release' into development 2013-03-08 14:54:31 +01:00
Damien Metzger 7ec0f0e391 // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
Damien Metzger 6d98b9a6ac // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
François Gaillard 8e357caaa1 Merge branch 'release' into development 2013-03-07 18:11:34 +01:00
Francois Gaillard 80331d2348 Merge branch 'release' into development 2013-03-07 18:11:34 +01:00
François Gaillard 7467fa17da [-] MO : Bug fix : AdminStores, smarty escape htmlall 2013-03-07 17:38:00 +01:00
Francois Gaillard 55caa6f0cb [-] MO : Bug fix : AdminStores, smarty escape htmlall 2013-03-07 17:38:00 +01:00
gRoussac a68cea058f [*] Bo : Fix #PSCFV-7989 red quantity > 1 on orders again 2013-03-04 11:26:19 +01:00
gRoussac 6f6a58e8f3 [*] Bo : Fix #PSCFV-7989 red quantity > 1 on orders again 2013-03-04 11:26:19 +01:00
gRoussac 96b1528560 [*] FO : Fix #PSCFV-7989 red quantity > 1 on orders 2013-03-04 10:23:03 +01:00
gRoussac ddcd63b9cc [*] FO : Fix #PSCFV-7989 red quantity > 1 on orders 2013-03-04 10:23:03 +01:00
gRoussac a37412e398 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-03-01 17:18:07 +01:00
gRoussac 42bb2a506c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-03-01 17:18:07 +01:00
vAugagneur ca53094d34 [-] BO : fixed bug when save image shop association 2013-03-01 17:17:17 +01:00
vAugagneur 8af272f6e3 [-] BO : fixed bug when save image shop association 2013-03-01 17:17:17 +01:00
gRoussac e9d759ae03 [-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program 2013-03-01 17:16:42 +01:00
gRoussac e385e2d19c [-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program 2013-03-01 17:16:42 +01:00