 Damien Metzger
|
53748c3119
|
// Code cleaning
|
2013-10-08 15:01:46 +02:00 |
|
|
Damien Metzger
|
c75cb99b51
|
// Code cleaning
|
2013-10-08 14:45:22 +02:00 |
|
|
Damien Metzger
|
a14118863e
|
// Code cleaning
|
2013-10-08 14:45:21 +02:00 |
|
|
Kevin Granger
|
3e6f425bd4
|
// Orders WIP
|
2013-10-08 12:26:48 +02:00 |
|
|
Damien Metzger
|
b7e13e2e7f
|
// Code cleaning
|
2013-10-08 11:55:10 +02:00 |
|
|
Kevin Granger
|
3e2d2e2afc
|
// fix Orders
|
2013-10-07 18:54:28 +02:00 |
|
|
Sarah Lorenzini
|
8f1b19a30b
|
// update customer service page
|
2013-10-07 16:45:48 +02:00 |
|
|
Jerome Nadaud
|
e94a32f80e
|
// Localization Countries edit bootstraped
|
2013-10-07 14:50:57 +02:00 |
|
|
Jerome Nadaud
|
6f2358a0da
|
// Manufacturer view bootstraped
|
2013-10-07 14:16:41 +02:00 |
|
|
Jerome Nadaud
|
2c4a20e21a
|
// Add form group to referer view form items
|
2013-10-07 13:44:04 +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 |
|
|
Jerome Nadaud
|
97824b2335
|
// License
|
2013-10-07 12:02:51 +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
|
a1f5455d07
|
// Fix Mark as favorite not updated
|
2013-10-07 11:03:03 +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
|
5b203cf789
|
// Remove languages select when only one language
|
2013-10-04 13:51:38 +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
|
1dc07ab2ba
|
// Modules positions drag and drop
|
2013-10-03 17:49:24 +02:00 |
|
|
Jerome Nadaud
|
39f0284aa3
|
// Modules positions drag and drop for bootstrap
|
2013-10-03 17:47:09 +02:00 |
|
|
Jerome Nadaud
|
6059ad163b
|
// Fix supply order state change save button
|
2013-10-03 11:51:08 +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 |
|
|
Jerome Nadaud
|
b472aaed96
|
// Fix Stock Cover select submit
|
2013-10-02 17:53:56 +02:00 |
|
|
Jerome Nadaud
|
dc06ef9c6d
|
// Stock movement fix export button on select filter
|
2013-10-02 17:09:31 +02:00 |
|
|
Damien Metzger
|
84a251a575
|
[*] BO : you can noww override header and footer for each controller
|
2013-10-02 17:04:18 +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
|
5993c188c5
|
// update login page
|
2013-10-02 16:50:09 +02:00 |
|
|
Sarah Lorenzini
|
791481e149
|
// update login page
|
2013-10-02 16:00:54 +02:00 |
|
|
Jerome Nadaud
|
3ce163449e
|
// Advanced stock management bootstraping
|
2013-10-02 14:48:23 +02:00 |
|
|
Sarah Lorenzini
|
1cb7f27a21
|
// update login page bootsrap
|
2013-10-02 14:38:13 +02:00 |
|
|
Sarah Lorenzini
|
ba06b217cc
|
// update javascript login page
|
2013-10-02 14:36:14 +02:00 |
|
|
Jerome Nadaud
|
661e18916b
|
// Permission bootstrap design
|
2013-10-02 12:30:07 +02:00 |
|
|
Jerome Nadaud
|
43c874e06e
|
// Fix line feed on address observation
|
2013-10-02 09:59:14 +02:00 |
|
|
Kevin Granger
|
65fc1fea63
|
// orders WIP
|
2013-10-01 18:50:41 +02:00 |
|
|
Jerome Nadaud
|
301de7a3a1
|
// Webservice and advanced stock list bootstraping
|
2013-10-01 18:29:35 +02:00 |
|
|
Jerome Nadaud
|
9c40dbb222
|
// Fix group view for bootstrap - removing limit restriction 'cause is now fixed
|
2013-10-01 17:00:56 +02:00 |
|
|
Jerome Nadaud
|
99a4ffe583
|
// Fix enable friendly url button generator on multishop
|
2013-10-01 16:44:03 +02:00 |
|
|
Jerome Nadaud
|
55a5c69d40
|
// Remove language select on only one language
|
2013-10-01 16:03:34 +02:00 |
|
|
Jerome Nadaud
|
bc8e972dfa
|
// Fix language id in features and quantities
|
2013-10-01 15:32:13 +02:00 |
|
|
Jerome Nadaud
|
759a3e191a
|
// Groups and language bootsrapify
|
2013-10-01 15:14:46 +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
|
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
|
a93ce00af8
|
// Groups view bootstrap design
|
2013-09-26 15:59:28 +02:00 |
|