Rémi Gaillard
|
a3233cc00c
|
//
|
2013-09-05 18:51:53 +02:00 |
|
Rémi Gaillard
|
c35d8c7845
|
//
|
2013-09-05 18:47:13 +02:00 |
|
Rémi Gaillard
|
f5e00a59f7
|
//
|
2013-09-05 18:41:51 +02:00 |
|
Rémi Gaillard
|
8868271c07
|
// push changes
|
2013-09-05 18:37:25 +02:00 |
|
Vincent Augagneur
|
06b54d0519
|
//typo
|
2013-09-05 16:35:15 +02:00 |
|
Damien Metzger
|
c306b2a425
|
// Small fix dashboard push
|
2013-09-05 15:41:10 +02:00 |
|
Vincent Augagneur
|
c34dbcf43a
|
//dashboard range date choice in ajax 👍
|
2013-09-05 15:25:41 +02:00 |
|
Vincent Augagneur
|
1c88bdd24e
|
//dashboard widget regardless refresh
|
2013-09-05 11:52:18 +02:00 |
|
Rémi Gaillard
|
6e3d24b567
|
// add push
|
2013-09-04 19:33:05 +02:00 |
|
Vincent Augagneur
|
6b2492b62c
|
//added data into dashproducts module
|
2013-09-04 18:26:58 +02:00 |
|
Kevin Granger
|
b4ecaf3ddb
|
// Carrier Wizard with bootstrap WIP
|
2013-09-04 15:38:45 +02:00 |
|
Kevin Granger
|
2990497a26
|
// header notifications
|
2013-09-03 12:25:48 +02:00 |
|
Vincent Augagneur
|
f165dae15d
|
//now you can refresh each dashboard module you want
|
2013-09-02 17:22:51 +02:00 |
|
Vincent Augagneur
|
81c47a085e
|
//fix remove class loading
|
2013-09-02 15:41:28 +02:00 |
|
Vincent Augagneur
|
f778b0da25
|
//remove class loading after widget filling
|
2013-09-02 15:09:27 +02:00 |
|
Vincent Augagneur
|
0cf96cd059
|
//small fix
|
2013-09-02 14:58:17 +02:00 |
|
Vincent Augagneur
|
d10a339542
|
//kevin special commit
|
2013-09-02 14:47:47 +02:00 |
|
Vincent Augagneur
|
a6aed9632a
|
//dashboard data binding first part
|
2013-09-02 11:43:50 +02:00 |
|
Rémi Gaillard
|
08b8277a7a
|
/////
|
2013-08-29 17:21:27 +02:00 |
|
Rémi Gaillard
|
c736c28ab5
|
// small ajax.php clean
|
2013-08-29 11:47:11 +02:00 |
|
Vincent Augagneur
|
ad428dfb2b
|
//MERGE branche release
|
2013-08-26 10:59:36 +02:00 |
|
Vincent Augagneur
|
7bcd8ee83c
|
//Added missing file
|
2013-08-23 09:42:37 +02:00 |
|
Vincent Augagneur
|
6ad274e39d
|
//Small fix
|
2013-08-22 10:33:03 +02:00 |
|
Vincent Augagneur
|
eea79052e0
|
[-] BO : fixed bug #PSCFV-10169 - now you can go backward from step 3 to 2 when no ranges are set
|
2013-08-22 10:15:55 +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 |
|
Jerome Nadaud
|
41190a66d4
|
[+] BO : Product tab fieldset and accordion fix
|
2013-08-19 18:45:57 +02:00 |
|
Jerome Nadaud
|
5336467e04
|
[-] BO : FixBug Friendly URL by language
|
2013-08-19 17:51:53 +02:00 |
|
Jerome Nadaud
|
68d7a320cd
|
[-] BO : FixBug Friendly URL change
|
2013-08-19 17:48:58 +02:00 |
|
Jerome Nadaud
|
0aa908bd25
|
[+] BO : Products add fileset for informations and prices tab
|
2013-08-19 11:59:27 +02:00 |
|
Vincent Augagneur
|
bad151a66f
|
[-] BO : fixed range deletion when press enter on input 'all' on carrier wizard
|
2013-08-19 10:20:22 +02:00 |
|
Jerome Nadaud
|
1138e8d01a
|
[-] BO : FixBug Friendly URL change
|
2013-08-19 10:17:42 +02:00 |
|
Vincent Augagneur
|
ec39b9e701
|
[-] BO : fixed bug #PSCFV-10111 when carrier is free don't display ranges in summary
|
2013-08-14 14:19:52 +02:00 |
|
Vincent Augagneur
|
26036cf7b2
|
//fixed min and max rang in carrier summary
|
2013-08-13 17:41:43 +02:00 |
|
Vincent Augagneur
|
b9808c5b5e
|
//small js fix
|
2013-08-13 17:26:16 +02:00 |
|
Jerome Nadaud
|
c6d3545b8b
|
[-] BO :FixBug Suppliers and Warehouses accordion
|
2013-08-13 17:14:57 +02:00 |
|
Vincent Augagneur
|
6e386868a6
|
[-] BO : fixed bug #PSCFV-10096
|
2013-08-13 16:14:09 +02:00 |
|
Jerome Nadaud
|
a0d870c4eb
|
[+] BO : Button action list improvements
|
2013-08-13 10:10:24 +02:00 |
|
Vincent Augagneur
|
3aff1341f6
|
//small fix
|
2013-08-13 10:01:18 +02:00 |
|
Vincent Augagneur
|
7cc59b2f49
|
//fixed bug #PSCFV-10091 part2
|
2013-08-12 15:23:52 +02:00 |
|
Vincent Augagneur
|
7ff8e44386
|
[-] BO : fixed bug when carrier is free and change shipping method
|
2013-08-12 15:17:28 +02:00 |
|
Vincent Augagneur
|
30c9156a41
|
[-] BO : fixed bug #PSCFV-10091 - you can now enable all zone in one clic
|
2013-08-12 14:56:49 +02:00 |
|
Vincent Augagneur
|
52806c0056
|
[-] BO : fixed bug #PSCFV-10033 - disable next step if no range has been added on carrier wizard
|
2013-08-12 14:41:44 +02:00 |
|
Vincent Augagneur
|
1571dd60c8
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-08-09 10:44:24 +02:00 |
|
Vincent Augagneur
|
13be8db639
|
//added checkbox for all zones
|
2013-08-09 10:44:20 +02:00 |
|
Jerome Nadaud
|
ad1efa612f
|
[+] BO : Better SendBulkAction function
|
2013-08-08 09:44:52 +02:00 |
|
Damien Metzger
|
ff69638595
|
// removed kay navigation in carrier wizard
|
2013-08-08 09:38:52 +02:00 |
|
Jerome Nadaud
|
65271a9385
|
[-] BO : FixBug Bulk action sended on filter
|
2013-08-07 18:42:43 +02:00 |
|
Vincent Augagneur
|
73f40a6cc6
|
//fixed carrier wizard typewatch
|
2013-08-07 17:29:44 +02:00 |
|
Jerome Nadaud
|
5f1506ffc2
|
[-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country
|
2013-08-07 14:09:40 +02:00 |
|
Jerome Nadaud
|
816a39fb4f
|
[+] BO : Footer list bulk actions
|
2013-08-07 10:43:53 +02:00 |
|