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

105 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
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
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
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
8e43f1e38f //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur
9a933d8818 //recovered View my shop button 2013-01-14 17:59:18 +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
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
DamienMetzger
867c9a5135 [*] BO : the global search now looks into the modules 2012-11-22 17:41:12 +01:00
DamienMetzger
849b96ab9c [*] BO : the global search now looks into the modules 2012-11-22 17:41:12 +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
sLorenzini
dd12ab6733 [-] FO : fixed bug #PSCFV-4490 2012-10-02 10:43:37 +00:00
sLorenzini
a6afe31272 [-] FO : fixed bug #PSCFV-4490 2012-10-02 10:43:37 +00:00
sLorenzini
28dcbfb174 [-] FO : fixed bug #PSCFV-4388 2012-09-27 14:36:25 +00:00
sLorenzini
b2f93911e5 [-] FO : fixed bug #PSCFV-4388 2012-09-27 14:36:25 +00:00
lLefevre
213b7fa96e [*] TR : #PSCFV-3999 : change string "multishop" by "multistore" in BO 2012-09-11 12:36:15 +00:00
lLefevre
3b48fb33fd [*] TR : #PSCFV-3999 : change string "multishop" by "multistore" in BO 2012-09-11 12:36:15 +00:00
vAugagneur
4fa4492239 //small fix 2012-08-28 08:13:55 +00:00
vAugagneur
4ecd5bab98 //small fix 2012-08-28 08:13:55 +00:00
dMetzger
c3c75bdaaf [-] BO : deactivated tab does are not displayed anymore #PSCFV-3740 2012-08-23 17:06:20 +00:00
dMetzger
af7d802776 [-] BO : deactivated tab does are not displayed anymore #PSCFV-3740 2012-08-23 17:06:20 +00:00
dMetzger
35eafb3912 // Fixed warning 2012-08-20 08:45:20 +00:00
dMetzger
0a1319bf47 // Fixed warning 2012-08-20 08:45:20 +00:00
dMetzger
1925df40fa // Tpl cleaning 2012-08-20 08:27:12 +00:00