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

133 Commits

Author SHA1 Message Date
Jerome Nadaud
067c78f868 // Fix notifications 2013-10-10 11:02:33 +02:00
Jerome Nadaud
cade037e4f // Use display modal class for lite displaying 2013-10-09 19:28:37 +02:00
Damien Metzger
b7e13e2e7f // Code cleaning 2013-10-08 11:55:10 +02:00
Damien Metzger
84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Damien Metzger
80376e9034 // Fixed meta title 2013-09-30 11:27:01 +02:00
Damien Metzger
7019af3a11 // Bound the menu to the employee option 2013-09-30 11:20:49 +02:00
Jerome Nadaud
320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Jerome Nadaud
f51ffe4c55 // Start design of multistore toolbar 2013-09-20 15:30:59 +02:00
Kevin Granger
7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger
a1b0710f85 // fix menu + sass refacto 2013-09-12 12:26:08 +02:00
Kevin Granger
99263a1492 // switch menu top // side 2013-09-11 16:56:10 +02:00
Kevin Granger
f29b1b3a31 // perts fix + menu top WIP 2013-09-10 20:23:06 +02:00
Damien Metzger
1d8da79507 [-] BO : fixed notifications when there is too much data 2013-09-10 09:17:54 +02:00
Kevin Granger
b2fd886722 // add new tpl for navigation top/side 2013-09-05 19:07:57 +02:00
Kevin Granger
b4ecaf3ddb // Carrier Wizard with bootstrap WIP 2013-09-04 15:38:45 +02:00
Kevin Granger
5f5997b567 // fix quick access -> target _blank for frontend 2013-09-03 15:19:34 +02:00
Kevin Granger
2990497a26 // header notifications 2013-09-03 12:25:48 +02:00
Kevin Granger
357c949faf // opti css menu 2013-08-29 18:54:36 +02:00
Jerome Nadaud
2426eac605 [+] BO : Add first action on menu icon list 2013-08-27 14:18:45 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +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
Kevin Granger
d3717f0950 // fix some test with colors & fix for login screen 2013-08-09 18:57:22 +02:00
Kevin Granger
bca29980d5 //fix layout and contrasted colors 2013-08-09 15:08:14 +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
e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
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
Kevin Granger
f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Kevin Granger
0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
Kevin Granger
02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
Kevin Granger
1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Kevin Granger
0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Kevin Granger
d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
Vincent Augagneur
4627768092 [-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated 2013-06-25 15:51:24 +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
3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
Kevin Granger
993690801e // Small changes with layout an css 2013-06-17 18:49:45 +02:00
gRoussac
aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +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
Kevin Granger
86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Vincent Augagneur
518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +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
sLorenzini
b96bca4bee [-] FO: fixed bug Backoffice and ipad - #PSCFV-7696 2013-03-01 10:42:03 +01:00