Kevin Granger
c5ab91f171
[+] BO dashboard WIP
2013-08-29 14:52:14 +02:00
Jerome Nadaud
00155d584e
// Fix language bug
2013-08-28 09:23:29 +02:00
Jerome Nadaud
64b575911a
[+] BO : Add list refresh button
2013-08-27 18:56:47 +02:00
Jerome Nadaud
6e46d718f7
// Fix merge problem
2013-08-27 18:22:02 +02:00
Jerome Nadaud
ed0037c435
[+] BO : New page header toolbar
2013-08-27 18:21:27 +02:00
Jerome Nadaud
eb78f766c3
// Fix for panel heading
2013-08-27 14:19:38 +02:00
Kevin Granger
f8f2c99d28
// Modules page + Warning
2013-08-26 11:38:10 +02:00
Jerome Nadaud
f6515a39eb
[+] BO : List header new toolbar functionality
2013-08-21 17:52:23 +02:00
Jerome Nadaud
d6b50a7f0c
// Merge Dev + Bootstrap
2013-08-21 15:27:14 +02:00
Kevin Granger
3005ca39f2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
admin-dev/themes/default/template/controllers/products/shipping.tpl
admin-dev/themes/default/template/controllers/shipping/content.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminCategoriesController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminModulesPositionsController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminStockInstantStateController.php
css/admin.css
js/admin-products.js
js/admin.js
2013-08-21 09:14:10 +02:00
Kevin Granger
17be1e7528
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-20 16:40:14 +02:00
Kevin Granger
44655ecdef
// breaking things
2013-08-20 16:38:31 +02:00
Jerome Nadaud
00e1b7c0eb
[-] BO : FixBug language in label for
2013-08-20 09:36:00 +02:00
Jerome Nadaud
d78ac1afe8
[-] BO : FixBug action link class
2013-08-19 15:01:56 +02:00
Jerome Nadaud
8cd8ede1a5
[+] BO : Add Highlighted class for default list row
2013-08-19 13:31:23 +02:00
Jerome Nadaud
21d5322e16
[-] BO : FixBug unset param icon
2013-08-19 12:00:43 +02:00
Jerome Nadaud
407abd8a10
[+] BO : Suply order receipt list action
2013-08-13 10:25:41 +02:00
Jerome Nadaud
a0d870c4eb
[+] BO : Button action list improvements
2013-08-13 10:10:24 +02:00
Jerome Nadaud
ecfe61972b
[+] BO : Change action link for button
2013-08-09 16:07:07 +02:00
Jerome Nadaud
65271a9385
[-] BO : FixBug Bulk action sended on filter
2013-08-07 18:42:43 +02:00
Jerome Nadaud
000ff0b462
[-] BO : FixBug Missing check value in options list
2013-08-07 17:15:13 +02:00
Jerome Nadaud
d95aae9a7b
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-07 10:44:42 +02:00
Jerome Nadaud
816a39fb4f
[+] BO : Footer list bulk actions
2013-08-07 10:43:53 +02:00
Kevin Granger
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
Kevin Granger
ff16de05de
// fix, design and fun !
2013-08-06 19:06:56 +02:00
Jerome Nadaud
bb4a72f46d
[+] BO : New Bulk actions button
2013-08-06 19:04:44 +02:00
Jerome Nadaud
0c4aeb31b8
[+] BO : Better action list button
2013-08-06 18:34:31 +02:00
Kevin Granger
bdc9d77c09
// Module List + some design WIP
2013-08-05 20:42:14 +02:00
gRoussac
a98740d25c
// small change, switch two buttons in list_header
2013-08-05 16:39:29 +02:00
jeromenadaud
48f041f035
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:12:04 +02:00
jeromenadaud
b81c021144
[-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist
2013-08-05 16:11:48 +02:00
Gregory Roussac
07181a37f5
Merge pull request #413 from ccauw/patch-9
...
[-] BO : bug color parameter in List
2013-08-05 06:37:46 -07:00
Kevin Granger
9f11ecfd78
// Add label attributes for, refacto browse file
2013-08-02 18:46:37 +02:00
jeromenadaud
b34acf74f2
[-] BO : FixBug Undefined variable title
2013-08-01 17:33:53 +02:00
jeromenadaud
24bf5e5bdf
[-] BO : FixBug Undefined variable currency
2013-08-01 17:26:07 +02:00
jeromenadaud
174dfa9a6b
[+] BO : Filter button default css class style
2013-08-01 17:13:02 +02:00
jeromenadaud
a29fa2dd09
[+] BO Better filters display
2013-08-01 16:59:08 +02:00
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
jeromenadaud
50bdfb9a1a
[-] BO FixBug Action button in list content
2013-07-31 18:44:20 +02:00
jeromenadaud
017e5ccbc8
[+] BO Pagination, filter and display
2013-07-31 18:37:01 +02:00
Sarah Lorenzini
ca253bcda2
// update preferences tab
2013-07-31 17:43:48 +02:00
Sarah Lorenzini
9debffe910
// update shipping tab
2013-07-31 15:06:59 +02:00
Sarah Lorenzini
d744b9dbf2
// update localization and modules tabs
2013-07-31 14:47:21 +02:00
Kevin Granger
a1cc4d14d0
[+] BO Customers > Customers / Customers > Groups
2013-07-30 18:47:13 +02:00
jeromenadaud
24a70479d3
[-] BO : FixBug Module list template
2013-07-30 18:06:35 +02:00
Kevin Granger
8bafaceb40
[+] BO Customers > Addresses // Helper > Required Fields
2013-07-30 10:35:47 +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