Commit Graph

37 Commits

Author SHA1 Message Date
Kevin Granger 0572fc09e8 // tweaks list + customers 2013-11-22 18:56:52 +01:00
Kevin Granger b10d50ef09 // fixs on horizontal nav + add icon on footer links 2013-11-21 12:15:21 +01:00
Kevin Granger dc29fae59d // reorganize some css and stuff on backward compatibility 2013-11-20 16:24:01 +01:00
Kevin Granger a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +01:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Damien Metzger f95a4d74df // Added Google Plus to the BO footer 2013-10-11 10:47:48 +02:00
Damien Metzger 7f5f78a6f3 // Connected footer links and go-top 2013-10-11 09:44:15 +02:00
Kevin Granger be3ccabe66 // footer + go to top + scroll y sidebar 2013-10-10 15:10:51 +02:00
Jerome Nadaud 51c1ee0cf0 // Move ajax box and ajax confirmation to content part 2013-10-02 12:23:10 +02:00
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
2013-09-13 11:41:14 +02:00
Kevin Granger 9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Damien Metzger 17618efb8b // Fixed details 2013-08-27 15:27:51 +02:00
Kevin Granger 93e03a3c3b // update bower with latest bootstrap 3.0.0 + fix layout 2013-08-21 17:17:24 +02:00
Kevin Granger 44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Damien Metzger 50cba2b12b // Added link to Addons in the footer 2013-08-08 17:49:17 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Kevin Granger bdc9d77c09 // Module List + some design WIP 2013-08-05 20:42:14 +02:00
Kevin Granger 0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Kevin Granger 86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
gRoussac 1b01c7a602 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder 2013-04-09 17:43:15 +02:00
gRoussac b623f50df7 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder 2013-04-09 17:43:15 +02:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
dMetzger 60c50eaee7 // Fixed CSS display #PSCFV-3673 2012-08-20 15:23:13 +00:00
dMetzger 0e39dc4bd0 // Fixed CSS display #PSCFV-3673 2012-08-20 15:23:13 +00:00
tDidierjean 465313a5cd // change page time load calculation 2012-04-11 11:53:44 +00:00
tDidierjean c2b5533d26 // change page time load calculation 2012-04-11 11:53:44 +00:00
rMalie 14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie 1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti 1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
mMarinetti 677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie 649837fec6 // Set admin display hooks in templates 2012-01-04 11:03:51 +00:00
rMalie 4bbb7fb4b8 // Set admin display hooks in templates 2012-01-04 11:03:51 +00:00
rGaillard de584ee4a1 // Move backoffice templates and media 2011-12-29 16:01:49 +00:00
rGaillard 3a4bfd3a6c // Move backoffice templates and media 2011-12-29 16:01:49 +00:00