 Damien Metzger
|
53748c3119
|
// Code cleaning
|
2013-10-08 15:01:46 +02:00 |
|
|
Damien Metzger
|
a14118863e
|
// Code cleaning
|
2013-10-08 14:45:21 +02:00 |
|
|
Jerome Nadaud
|
6f2358a0da
|
// Manufacturer view bootstraped
|
2013-10-07 14:16:41 +02:00 |
|
|
Jerome Nadaud
|
efb041b747
|
// New referer Bootstraped
|
2013-10-07 13:40:36 +02:00 |
|
|
Jerome Nadaud
|
6fc12968b8
|
// Fix missing module configuration bar #PSCSX-3
|
2013-10-07 12:03:37 +02:00 |
|
|
Kevin Granger
|
2c3bf85ca7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-07 11:12:59 +02:00 |
|
|
Kevin Granger
|
ba7d9eec21
|
// fix Orders
|
2013-10-07 11:11:21 +02:00 |
|
|
Jerome Nadaud
|
9b79a02e88
|
// Remove unused function
|
2013-10-07 11:03:42 +02:00 |
|
|
Kevin Granger
|
2ab3f08eab
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-04 19:13:13 +02:00 |
|
|
Kevin Granger
|
c2ea0be841
|
// orders WIP
|
2013-10-04 19:13:02 +02:00 |
|
|
Jerome Nadaud
|
2e4f5c0b07
|
// Menus details list is now bootstraped
|
2013-10-04 17:34:07 +02:00 |
|
|
Vincent Augagneur
|
5564b342f4
|
//wizard boostrap and title fix
|
2013-10-04 17:07:10 +02:00 |
|
|
Jerome Nadaud
|
5557ac1aee
|
// Remove attribute language desc from stock movement list when product attribute is removed
|
2013-10-04 15:30:27 +02:00 |
|
|
Jerome Nadaud
|
887b68d3f2
|
// Customers Groups View list resize
|
2013-10-04 14:24:33 +02:00 |
|
|
Jerome Nadaud
|
9ae6546d90
|
// Features - Remove select language with one language and add autosize to textarea
|
2013-10-04 12:23:01 +02:00 |
|
|
Kevin Granger
|
bb7dd876af
|
// orders WIP
|
2013-10-03 21:04:35 +02:00 |
|
|
Jerome Nadaud
|
874e17aa6f
|
// remove javascript include from tpl
|
2013-10-03 17:55:30 +02:00 |
|
|
Jerome Nadaud
|
309f4333a7
|
// Supply orders bootstraping
|
2013-10-03 14:13:15 +02:00 |
|
|
Damien Metzger
|
e82f0feacf
|
// Fixed customer tab
|
2013-10-03 09:52:25 +02:00 |
|
|
Jerome Nadaud
|
90b203fde3
|
// Stock instant bootstraping
|
2013-10-02 18:59:34 +02:00 |
|
|
Jerome Nadaud
|
75771e0723
|
// Supply order bootstraping
|
2013-10-02 18:59:21 +02:00 |
|
|
Jerome Nadaud
|
f891f64cc4
|
// Stock cover bootstraping
|
2013-10-02 18:58:47 +02:00 |
|
|
Damien Metzger
|
3cfe76ec0c
|
// Fixed mean age
|
2013-10-02 18:10:51 +02:00 |
|
|
Jerome Nadaud
|
dc06ef9c6d
|
// Stock movement fix export button on select filter
|
2013-10-02 17:09:31 +02:00 |
|
|
Jerome Nadaud
|
f63e1065b3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-02 16:58:37 +02:00 |
|
|
Jerome Nadaud
|
04e5617d7d
|
// Instant stock bootstraping
|
2013-10-02 16:58:27 +02:00 |
|
|
Sarah Lorenzini
|
791481e149
|
// update login page
|
2013-10-02 16:00:54 +02:00 |
|
|
Jerome Nadaud
|
acb5bf77f6
|
// Remove comment
|
2013-10-02 14:52:13 +02:00 |
|
|
Jerome Nadaud
|
3ce163449e
|
// Advanced stock management bootstraping
|
2013-10-02 14:48:23 +02:00 |
|
|
Jerome Nadaud
|
a891c9277a
|
// Advanced stock management details list
|
2013-10-02 12:09:03 +02:00 |
|
|
Jerome Nadaud
|
dd79b3c702
|
// Manufacturer bootstraping
|
2013-10-02 09:43:46 +02:00 |
|
|
Jerome Nadaud
|
dd60eb66cf
|
// Fix features list filters and sort
|
2013-10-01 18:10:52 +02:00 |
|
|
Jerome Nadaud
|
f2849bdb70
|
// Remove unnecessary function
|
2013-10-01 17:56:17 +02:00 |
|
|
Jerome Nadaud
|
68831ffbe9
|
// Fix attribute group view list
|
2013-10-01 17:55:20 +02:00 |
|
|
Kevin Granger
|
a866de41e7
|
// login form
|
2013-10-01 16:24:14 +02:00 |
|
|
Jerome Nadaud
|
299d1f65ec
|
//Fix Stats bug
|
2013-10-01 15:15:02 +02:00 |
|
|
Jerome Nadaud
|
759a3e191a
|
// Groups and language bootsrapify
|
2013-10-01 15:14:46 +02:00 |
|
|
Damien Metzger
|
a6d8ffa293
|
// More breadcrumbs improvements
|
2013-09-30 15:38:22 +02:00 |
|
|
Kevin Granger
|
8ed77030aa
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/products/suppliers.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminGroupsController.php
controllers/admin/AdminManufacturersController.php
|
2013-09-30 11:01:23 +02:00 |
|
|
Jerome Nadaud
|
c2b9ff40ef
|
[-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list
|
2013-09-27 19:20:46 +02:00 |
|
|
Nino Uzelac
|
ca01b58262
|
fix multilingual field validity in AdminProductsController
|
2013-09-27 18:22:07 +02:00 |
|
|
Damien Metzger
|
650c18e9f7
|
// Added Translations KPIs
|
2013-09-27 14:51:12 +02:00 |
|
|
Jerome Nadaud
|
6449ecfb32
|
[-] BO : Force invoice footer text to 1 ligne
|
2013-09-27 14:41:50 +02:00 |
|
|
Jerome Nadaud
|
9e58e3edfd
|
// Advanced stock bootstrap design
|
2013-09-27 12:24:44 +02:00 |
|
|
Jerome Nadaud
|
9ea723d07e
|
// Slip and Statuses bootstrap design
|
2013-09-26 17:30:34 +02:00 |
|
|
Jerome Nadaud
|
fa2f10ffc6
|
// Add row break to color element
|
2013-09-26 16:43:57 +02:00 |
|
|
Jerome Nadaud
|
a93ce00af8
|
// Groups view bootstrap design
|
2013-09-26 15:59:28 +02:00 |
|
|
Jerome Nadaud
|
157ab0c8b9
|
// Prices rules list size
|
2013-09-26 15:01:23 +02:00 |
|
|
Jerome Nadaud
|
2d65f5a8c0
|
// Cart rules bootstrap design
|
2013-09-26 14:55:28 +02:00 |
|
|
Rémi Gaillard
|
b6d3bf1bc3
|
// missing method
|
2013-09-26 13:49:17 +02:00 |
|