dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,091 Commits 9 Branches 19 Tags
dca6e39febeb73d7b9faa08cae787a4aba3ea607
Commit Graph

38 Commits

Author SHA1 Message Date
Kevin Granger f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
jeromenadaud 0e3f2d6a82 [-] BO : FixBug Invalid offset when only one error in layout 2013-07-31 09:18:13 +02:00
Kevin Granger a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
Kevin Granger 0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
Kevin Granger 1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Kevin Granger aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Kevin Granger 6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +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
vAugagneur 177cf36fa6 //reduced informations block and added click to see more link 2013-01-16 11:07:29 +01:00
vAugagneur a2eda82603 //reduced informations block and added click to see more link 2013-01-16 11:07:29 +01: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
rGaillard 02f93b09f5 // Small fixes 2012-09-11 14:01:50 +00:00
rGaillard 3dd1222d18 // Small fixes 2012-09-11 14:01:50 +00:00
rGaillard e6810f7be5 // small fix 2012-09-11 12:42:16 +00:00
rGaillard 5430714c18 // small fix 2012-09-11 12:42:16 +00:00
rGaillard 4e5f28f6c1 // Fix PSCFV-3933 2012-09-06 15:43:45 +00:00
rGaillard b3243a3815 // Fix PSCFV-3933 2012-09-06 15:43:45 +00:00
lLefevre 3ddf7259a2 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
lLefevre 9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
tDidierjean 4a4baeef11 // Small fixes 2012-03-26 15:26:23 +00:00
tDidierjean 546c97251d // Small fixes 2012-03-26 15:26:23 +00:00
mDeflotte c821a9b40d // By default in the BO if there is only one warning, don't display the "Click here to see more" and show the warning. 2012-03-02 15:49:32 +00:00
mDeflotte 5b5d3c1b7e // By default in the BO if there is only one warning, don't display the "Click here to see more" and show the warning. 2012-03-02 15:49:32 +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
mDeflotte 3662c42fe1 // Fix Bug on admin login - errors messages was twice printed 2012-02-03 08:15:21 +00:00
mDeflotte 0adca03b0c // Fix Bug on admin login - errors messages was twice printed 2012-02-03 08:15:21 +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