Commit Graph

4313 Commits

Author SHA1 Message Date
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
sLorenzini
8b4e42ef3c [-] FO: fixed bug two little coding error - #PSCFV-7982 2013-03-01 15:23:36 +01:00
sLorenzini
ccc77168a2 [-] FO: fixed bug two little coding error - #PSCFV-7982 2013-03-01 15:23:36 +01:00
sLorenzini
31a7d83861 [-] BO: fixed bug block shipping display in orders 2013-03-01 15:00:00 +01:00
sLorenzini
051a2354e9 [-] BO: fixed bug block shipping display in orders 2013-03-01 15:00:00 +01:00
sLorenzini
c3b940b864 [-] BO: fixed header display on tablet- #PSCFV-6166 2013-03-01 14:12:43 +01:00
sLorenzini
0130e6c443 [-] BO: fixed header display on tablet- #PSCFV-6166 2013-03-01 14:12:43 +01:00
sLorenzini
b96bca4bee [-] FO: fixed bug Backoffice and ipad - #PSCFV-7696 2013-03-01 10:42:03 +01:00
sLorenzini
8c1f67e4ce [-] FO: fixed bug Backoffice and ipad - #PSCFV-7696 2013-03-01 10:42:03 +01:00
Damien Metzger
265b696b6f // A bit of cleaning in the admin css 2013-02-28 15:51:59 +01:00
Damien Metzger
bf27d18e3b // A bit of cleaning in the admin css 2013-02-28 15:51:59 +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
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
fd68d3b3d5 // Installer can be translated at /install-dev/dev/translate.php 2013-02-27 14:53:51 +01:00