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

180 Commits

Author SHA1 Message Date
Damien Metzger
fb9204ebd6 // Fixed module page 2013-10-10 09:14:58 +02:00
Damien Metzger
d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Jerome Nadaud
6fc12968b8 // Fix missing module configuration bar #PSCSX-3 2013-10-07 12:03:37 +02:00
Jerome Nadaud
97824b2335 // License 2013-10-07 12:02:51 +02:00
Jerome Nadaud
a1f5455d07 // Fix Mark as favorite not updated 2013-10-07 11:03:03 +02:00
Kevin Granger
5c04e5564c // tags + fixed-width 2013-09-17 11:59:57 +02:00
Kevin Granger
7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger
161c612c02 // fix modules list 2013-09-04 18:56:00 +02:00
Kevin Granger
d4023ce0a3 // config Compass + Bower Update 2013-08-30 15:18:20 +02:00
Kevin Granger
40e2b5b8d9 // fix BO modules list -> fav view 2013-08-29 17:23:26 +02:00
Damien Metzger
36815be192 // Fixed warning 2013-08-29 16:33:06 +02:00
Jerome Nadaud
4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Kevin Granger
4c92db8912 // Modules position 2013-08-27 19:08:53 +02:00
Kevin Granger
9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Jerome Nadaud
946840ae45 // Small id fix 2013-08-26 18:39:38 +02:00
Kevin Granger
a972de046e // fix Modules page 2013-08-26 12:26:41 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud
5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Jerome Nadaud
e33cd2d13b [+] BO : Add active class to list view button 2013-08-13 13:55:41 +02:00
Jerome Nadaud
1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Kevin Granger
6ae222e720 // some sass/compass magic for color schemes… and few new bugs to fix with layout 2013-08-08 16:59:39 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Kevin Granger
58cba9f894 // [+] Module - Login Addons 2013-08-06 10:19:43 +02:00
Kevin Granger
bdc9d77c09 // Module List + some design WIP 2013-08-05 20:42:14 +02:00
Sarah Lorenzini
60f567d2ff // update modules tab 2013-08-02 15:20:12 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +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
sLorenzini
f194aec8c5 // update module and orders tab 2013-07-22 17:56:24 +02:00
sLorenzini
66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
sLorenzini
27571f4d06 //update module tab 2013-07-15 12:02:03 +02:00
sLorenzini
0c4a5bd984 // update module tab positions & payment 2013-07-15 11:55:06 +02:00
sLorenzini
160857bdc3 // update css module tab 2013-07-12 14:30:44 +02:00
sLorenzini
40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
sLorenzini
f847c821ed // update tab modules bootsrap 2013-07-10 18:19:03 +02:00
gRoussac
9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency 2013-07-02 14:51:25 +02:00
Vincent Augagneur
38c4ea2775 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 10:11:31 +02:00
Vincent Augagneur
d6dcf7058f [-] BO : fixed bug #PSCFV-9622 2013-07-01 10:11:13 +02:00
Damien Metzger
a8d96ed0c0 // Removed useless feature 2013-06-28 16:38:08 +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
Damien Metzger
cb95bf68a1 // Displaaaay 2013-06-18 15:58:32 +02:00
Damien Metzger
c04d2626f5 // Improved module list view 2013-06-18 15:34:58 +02:00
vAugagneur
7c626218df Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur
e271524cc4 Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur
661ddd7548 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
vAugagneur
5757e56864 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
Rémi Gaillard
02baab7393 [*] BO: List all modules with an upgrade available on AdminModules header 2013-03-27 18:58:21 +01:00
Rémi Gaillard
c2d8853f57 [*] BO: List all modules with an upgrade available on AdminModules header 2013-03-27 18:58:21 +01:00