dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

138 Commits

Author SHA1 Message Date
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Damien Metzger
006e8718f2 // Improved label of IETF language tag 2013-07-01 12:35:32 +02:00
Damien Metzger
fd0bc675e5 // Fixed display 2013-06-18 15:54:29 +02:00
sLorenzini
c62dc3dc7a [-] BO: fixed bug button on module list 2013-06-18 15:39:48 +02:00
sLorenzini
48db491c2e [-] BO: fixed bug #PSCFV-9463 + improve some css on BO menu 2013-06-18 15:39:46 +02:00
Damien Metzger
c04d2626f5 // Improved module list view 2013-06-18 15:34:58 +02:00
sLorenzini
3daf4cdb99 [-] BO: fixed bug #PSCFV-9461 2013-06-18 14:46:09 +02:00
Kevin Granger
993690801e // Small changes with layout an css 2013-06-17 18:49:45 +02:00
Kevin Granger
6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Kevin Granger
b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
sLorenzini
1ebd625563 [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
sLorenzini
a7d61c551e [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
Damien Metzger
db70f38a89 // Fixed module list 2013-03-22 16:50:46 +01:00
Damien Metzger
571f566af0 // Fixed module list 2013-03-22 16:50:46 +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
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
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
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
sLorenzini
3f22df2cfb [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini
755573184c [-] BO: improve payment module page on IE 2013-02-20 11:35:50 +01:00
sLorenzini
602c11079d [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini
ae9b78dc0f [-] BO: improve module payment page 2013-02-20 11:08:20 +01:00
sLorenzini
110afe7b69 [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
sLorenzini
4ce88468df [-] BO: improve payment module page + header 2013-02-20 10:00:18 +01:00
Damien Metzger
c6331299cb // Moved html and js compression from global smarty config to front office smarty config 2013-02-13 14:38:43 +01:00
Damien Metzger
288021224c // Moved html and js compression from global smarty config to front office smarty config 2013-02-13 14:38:43 +01:00
Damien Metzger
4ab7b7eff4 // Translations 2013-02-07 18:20:19 +01:00
Damien Metzger
26a01f0a41 // Translations 2013-02-07 18:20:19 +01:00
vAugagneur
0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur
517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur
cbb87e4bbc //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
vAugagneur
ffbc326454 //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
vAugagneur
61371b5b4c //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
vAugagneur
7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00