Commit Graph

3398 Commits

Author SHA1 Message Date
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
Damien Metzger
52435c2fad // Installer can be translated at /install-dev/dev/translate.php 2013-02-27 14:53:51 +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
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
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
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
679b45b5bd [-] BO: pagination was missing on tax rules listing 2013-02-25 14:50:23 +01:00
Rémi Gaillard
31e3882d82 [-] BO: pagination was missing on tax rules listing 2013-02-25 14:50:23 +01:00
Damien Metzger
0a71a1ee86 // With the image 2013-02-25 13:42:55 +01:00
Damien Metzger
9e588b2f82 // With the image 2013-02-25 13:42:55 +01:00
Damien Metzger
412f05ceee // CSS fix 2013-02-25 13:42:34 +01:00
Damien Metzger
1b372f4b4f // CSS fix 2013-02-25 13:42:34 +01:00
Damien Metzger
9ebe9e1894 // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Damien Metzger
d4a6a56d1b // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Rémi Gaillard
0e38d44a21 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
Rémi Gaillard
0a716e03c5 // some changes on admin customer view 2013-02-22 14:16:49 +01:00