65271a9385
[-] BO : FixBug Bulk action sended on filter
2013-08-07 18:42:43 +02:00
000ff0b462
[-] BO : FixBug Missing check value in options list
2013-08-07 17:15:13 +02:00
d95aae9a7b
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-07 10:44:42 +02:00
816a39fb4f
[+] BO : Footer list bulk actions
2013-08-07 10:43:53 +02:00
349c98d567
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Jerome Nadaud
# Via Jerome Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
[+] BO : New Bulk actions button
2013-08-06 19:07:59 +02:00
ff16de05de
// fix, design and fun !
2013-08-06 19:06:56 +02:00
bb4a72f46d
[+] BO : New Bulk actions button
2013-08-06 19:04:44 +02:00
0c4aeb31b8
[+] BO : Better action list button
2013-08-06 18:34:31 +02:00
bdc9d77c09
// Module List + some design WIP
2013-08-05 20:42:14 +02:00
a98740d25c
// small change, switch two buttons in list_header
2013-08-05 16:39:29 +02:00
48f041f035
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:12:04 +02:00
b81c021144
[-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist
2013-08-05 16:11:48 +02:00
07181a37f5
Merge pull request #413 from ccauw/patch-9
...
[-] BO : bug color parameter in List
2013-08-05 06:37:46 -07:00
9f11ecfd78
// Add label attributes for, refacto browse file
2013-08-02 18:46:37 +02:00
b34acf74f2
[-] BO : FixBug Undefined variable title
2013-08-01 17:33:53 +02:00
24bf5e5bdf
[-] BO : FixBug Undefined variable currency
2013-08-01 17:26:07 +02:00
174dfa9a6b
[+] BO : Filter button default css class style
2013-08-01 17:13:02 +02:00
a29fa2dd09
[+] BO Better filters display
2013-08-01 16:59:08 +02:00
5defc39def
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +02:00
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
50bdfb9a1a
[-] BO FixBug Action button in list content
2013-07-31 18:44:20 +02:00
017e5ccbc8
[+] BO Pagination, filter and display
2013-07-31 18:37:01 +02:00
ca253bcda2
// update preferences tab
2013-07-31 17:43:48 +02:00
9debffe910
// update shipping tab
2013-07-31 15:06:59 +02:00
d744b9dbf2
// update localization and modules tabs
2013-07-31 14:47:21 +02:00
a1cc4d14d0
[+] BO Customers > Customers / Customers > Groups
2013-07-30 18:47:13 +02:00
24a70479d3
[-] BO : FixBug Module list template
2013-07-30 18:06:35 +02:00
8bafaceb40
[+] BO Customers > Addresses // Helper > Required Fields
2013-07-30 10:35:47 +02:00
d95a519ace
[+] BO Customers WIP
2013-07-29 19:18:02 +02:00
613c9b66e5
// fix carriers
2013-07-29 16:51:03 +02:00
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
ae225dce4c
// WIP customer
2013-07-29 16:16:10 +02:00
243834ee17
// update shipping tab
2013-07-29 14:14:00 +02:00
9f9c0ef416
[+] BO Orders
2013-07-26 18:54:28 +02:00
c0cf92cbdf
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
1a2b78b00f
[+] BO Invoices
2013-07-26 15:34:11 +02:00
3c035324f4
// update order tab
2013-07-26 12:15:23 +02:00
72b046d5f0
[+] BO Manufacturers
2013-07-26 10:21:23 +02:00
9308c5c527
no message
2013-07-25 19:18:54 +02:00
488cf0919a
// BO attributes
2013-07-25 15:51:41 +02:00
b5ae321ea5
// fix input + switch
2013-07-25 11:55:27 +02:00
21cf113c44
twice class attribute in color input
2013-07-25 10:26:53 +02:00
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
063fd9941c
Merge pull request #189 from PrestaEdit/patch-12
...
[*] BO: use lang for input file
2013-07-24 03:10:00 -07:00
f7d1743c8a
// fix tags in helper
2013-07-24 11:42:47 +02:00
9d16eb1d1b
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
0b4512dbcb
// some work on style sheets
2013-07-18 18:51:24 +02:00
ffb62426d8
Merge pull request #516 from PrestaEdit/patch-41
...
[*] BO: more than one image in HelperForm
2013-07-17 07:44:26 -07:00
02921dc9d0
[+] Helper form WIP
2013-07-16 19:23:46 +02:00
0c4a5bd984
// update module tab positions & payment
2013-07-15 11:55:06 +02:00
Jerome Nadaud