 Kevin Granger
|
447f1d4ba7
|
// quick fix customer view
|
2013-10-10 19:04:25 +02:00 |
|
|
Rémi Gaillard
|
278dc32482
|
[*] BO: Add an option to autologout to the backoffice after 15 minutes
|
2013-10-10 12:20:10 +02:00 |
|
|
Kevin Granger
|
6c35b20b02
|
// organize css
|
2013-10-10 11:43:24 +02:00 |
|
|
Damien Metzger
|
fb9204ebd6
|
// Fixed module page
|
2013-10-10 09:14:58 +02:00 |
|
|
Kevin Granger
|
9de6ec0379
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-09 20:28:15 +02:00 |
|
|
Kevin Granger
|
5b509c2c20
|
// login WIP
|
2013-10-09 20:26:04 +02:00 |
|
|
Jerome Nadaud
|
6245b05b6e
|
// Remove flags from language select
|
2013-10-09 19:39:05 +02:00 |
|
|
Jerome Nadaud
|
5ec76a759a
|
// Fix Dashboard toolbar
|
2013-10-09 19:12:20 +02:00 |
|
|
Kevin Granger
|
719e5f4faf
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-10-09 18:55:46 +02:00 |
|
|
Kevin Granger
|
74f12c23be
|
// login WIP
|
2013-10-09 18:54:13 +02:00 |
|
|
Jerome Nadaud
|
cfbb0d872b
|
// Add confirmation on category image delete
|
2013-10-09 18:47:33 +02:00 |
|
|
Jerome Nadaud
|
eae76eb63e
|
// Pagination bootstraping
|
2013-10-09 18:36:19 +02:00 |
|
|
Kevin Granger
|
2c7ed00b39
|
// pagination
|
2013-10-09 17:21:53 +02:00 |
|
|
Damien Metzger
|
9b24cca088
|
// Fixed category breadcrumb
|
2013-10-09 16:44:58 +02:00 |
|
|
Jerome Nadaud
|
f5452aea66
|
// Products fix
|
2013-10-09 15:23:44 +02:00 |
|
|
Damien Metzger
|
a2371067bf
|
// CSS fixes
|
2013-10-09 15:11:04 +02:00 |
|
|
Jerome Nadaud
|
3cca8206b9
|
// Fix missing unwanted div
|
2013-10-09 14:06:22 +02:00 |
|
|
Jerome Nadaud
|
8c9dffd854
|
// Add pagination to states list
|
2013-10-09 10:03:27 +02:00 |
|
|
Jerome Nadaud
|
9bdde5c5c0
|
// Add pagination to countries list
|
2013-10-09 09:59:49 +02:00 |
|
|
Jerome Nadaud
|
18d909c05d
|
// Add cache control to ajax request for ipad
|
2013-10-09 09:55:17 +02:00 |
|
|
Kevin Granger
|
daa1cc47db
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-09 09:43:10 +02:00 |
|
|
Kevin Granger
|
b4459e39a4
|
// Orders WIP
|
2013-10-09 09:43:04 +02:00 |
|
|
Jerome Nadaud
|
57c34488ff
|
// Orders refund buttons
|
2013-10-09 09:41:51 +02:00 |
|
|
Jerome Nadaud
|
5a4548bd51
|
// Toolbar for search
|
2013-10-09 09:41:10 +02:00 |
|
|
Damien Metzger
|
d9b40b8f35
|
// Added Modules KPIs
|
2013-10-08 19:39:52 +02:00 |
|
|
Kevin Granger
|
797a6c121a
|
// Orders WIP
|
2013-10-08 18:53:41 +02:00 |
|
|
Jerome Nadaud
|
d595cd2f12
|
// Toolbar modif for products
|
2013-10-08 18:51:10 +02:00 |
|
|
Jerome Nadaud
|
b9cfc24922
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-08 18:42:19 +02:00 |
|
|
Jerome Nadaud
|
d88857610d
|
// Toolbar modifs
|
2013-10-08 18:42:07 +02:00 |
|
|
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 |
|