Kevin Granger
5defc39def
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +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
a1cc4d14d0
[+] BO Customers > Customers / Customers > Groups
2013-07-30 18:47:13 +02:00
Kevin Granger
8bafaceb40
[+] BO Customers > Addresses // Helper > Required Fields
2013-07-30 10:35:47 +02:00
Kevin Granger
b95478d529
[+] BO Customers Groups WIP
2013-07-29 20:39:52 +02:00
Kevin Granger
d95a519ace
[+] BO Customers WIP
2013-07-29 19:18:02 +02:00
Kevin Granger
613c9b66e5
// fix carriers
2013-07-29 16:51:03 +02:00
Kevin Granger
483dbd7b53
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
// update shipping tab
// update shipping tab
Conflicts:
admin-dev/themes/default/template/helpers/options/options.tpl
2013-07-29 16:21:31 +02:00
Kevin Granger
ae225dce4c
// WIP customer
2013-07-29 16:16:10 +02:00
Kevin Granger
94de4d3d2f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
[-] BO : Order template misplaced empty form
[+] BO : Handler invoice date generation button
2013-07-26 18:55:18 +02:00
Kevin Granger
9f9c0ef416
[+] BO Orders
2013-07-26 18:54:28 +02:00
Kevin Granger
1a2b78b00f
[+] BO Invoices
2013-07-26 15:34:11 +02:00
Kevin Granger
8b7c29dd18
[+] BO Scenes - Tags - Attachments
2013-07-26 11:12:50 +02:00
Kevin Granger
72b046d5f0
[+] BO Manufacturers
2013-07-26 10:21:23 +02:00
Kevin Granger
9e5bbac559
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
[-] BO : BugFix Cancel modification button error
[+] BO : Product "For" and combination button
// update order tab
[+] BO : Product "For"
[+] BO : Product "For" and new carriers select list
Conflicts:
admin-dev/themes/default/css/admin-theme.css
2013-07-25 19:21:59 +02:00
Kevin Granger
9308c5c527
no message
2013-07-25 19:18:54 +02:00
Kevin Granger
488cf0919a
// BO attributes
2013-07-25 15:51:41 +02:00
Kevin Granger
59aa781b0d
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
// oops
[-] BO : Add missing tmp directory
2013-07-25 11:55:58 +02:00
Kevin Granger
b5ae321ea5
// fix input + switch
2013-07-25 11:55:27 +02:00
Kevin Granger
edc2113330
// fix merge
2013-07-24 17:02:23 +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
288c0d3ca8
// Css cleaning
2013-07-19 18:41:15 +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
b8babdadb3
// products wip
2013-07-12 19:17:51 +02:00
Kevin Granger
c12ce3dd29
// Products
2013-07-12 17:27:25 +02:00
Kevin Granger
84c0ccbae6
// products TPL
2013-07-11 18:58:44 +02:00
Kevin Granger
f042d704d2
// field translatable + tpl products + fixs
2013-07-10 19:39:35 +02:00
Kevin Granger
ec466b8c70
// Porting more product tpl
2013-07-09 19:10:56 +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
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
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
Kevin Granger
3fd3ad2919
Added close span tag to avoid bug on IE8 (thanks Atch)
2013-05-20 18:20:55 +03:00
Kevin Granger
2a3820f068
Added close span tag to avoid bug on IE8 (thanks Atch)
2013-05-20 18:20:55 +03:00
Kevin Granger