Rémi Gaillard
|
bb35a5b004
|
// multishop
|
2013-10-11 10:04:10 +02:00 |
|
Damien Metzger
|
7f5f78a6f3
|
// Connected footer links and go-top
|
2013-10-11 09:44:15 +02:00 |
|
Kevin Granger
|
544423ea1e
|
// remove duplicate
|
2013-10-10 20:05:58 +02:00 |
|
Kevin Granger
|
447f1d4ba7
|
// quick fix customer view
|
2013-10-10 19:04:25 +02:00 |
|
Damien Metzger
|
77551c03f5
|
// Fixed potential warning
|
2013-10-10 18:49:27 +02:00 |
|
Vincent Augagneur
|
87417ed928
|
//producttooltip now use bootstrap design
|
2013-10-10 18:07:08 +02:00 |
|
Kevin Granger
|
5620992735
|
// fix dashboard
|
2013-10-10 16:52:41 +02:00 |
|
Kevin Granger
|
7d717ea207
|
// fix css + kpi + dashboard
|
2013-10-10 16:29:40 +02:00 |
|
Jerome Nadaud
|
22dcaf246c
|
// Add icon and specific title to list
|
2013-10-10 15:36:50 +02:00 |
|
Kevin Granger
|
be3ccabe66
|
// footer + go to top + scroll y sidebar
|
2013-10-10 15:10:51 +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 |
|
Rémi Gaillard
|
7fdf6e614f
|
// don't display some field when an employee edit it's own profile
|
2013-10-10 11:35:05 +02:00 |
|
Jerome Nadaud
|
067c78f868
|
// Fix notifications
|
2013-10-10 11:02:33 +02:00 |
|
Damien Metzger
|
79b0a571c0
|
// Updated languages in the installer
|
2013-10-10 09:47:10 +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
|
cade037e4f
|
// Use display modal class for lite displaying
|
2013-10-09 19:28:37 +02:00 |
|
Jerome Nadaud
|
5ec76a759a
|
// Fix Dashboard toolbar
|
2013-10-09 19:12:20 +02:00 |
|
Jerome Nadaud
|
a5d1816336
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-09 18:59:32 +02:00 |
|
Jerome Nadaud
|
0e4cb5bcd5
|
// Form group bootstraping
|
2013-10-09 18:59: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 |
|
Damien Metzger
|
079534f039
|
// Fix header/footer override in admincontroller
|
2013-10-09 18:51:31 +02:00 |
|
Jerome Nadaud
|
cfbb0d872b
|
// Add confirmation on category image delete
|
2013-10-09 18:47:33 +02:00 |
|
Jerome Nadaud
|
2d9a54c19e
|
// Remove button icon class
|
2013-10-09 18:43:22 +02:00 |
|
Jerome Nadaud
|
eae76eb63e
|
// Pagination bootstraping
|
2013-10-09 18:36:19 +02:00 |
|
Jerome Nadaud
|
d4bf765dd6
|
// Pagination bootstraping
|
2013-10-09 18:31:51 +02:00 |
|
Damien Metzger
|
1939b8026b
|
// CSS fix
|
2013-10-09 18:06:53 +02:00 |
|
Kevin Granger
|
84711bc386
|
// added .process-icon-save-and-preview
|
2013-10-09 17:57:02 +02:00 |
|
Kevin Granger
|
2c7ed00b39
|
// pagination
|
2013-10-09 17:21:53 +02:00 |
|
Rémi Gaillard
|
fee92eecdd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-09 16:58:13 +02:00 |
|
Rémi Gaillard
|
edddac8a0c
|
// add colors on some controllers
|
2013-10-09 16:47:47 +02:00 |
|
Damien Metzger
|
9b24cca088
|
// Fixed category breadcrumb
|
2013-10-09 16:44:58 +02:00 |
|
Jerome Nadaud
|
eadbefedae
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-09 16:42:44 +02:00 |
|
Jerome Nadaud
|
e1ff774fcd
|
// Restoring toolbar.tpl file for retrocompatibility
|
2013-10-09 16:42:13 +02:00 |
|
Vincent Augagneur
|
477973a43e
|
//carrier wizard button good place and order
|
2013-10-09 16:24:25 +02:00 |
|
Damien Metzger
|
e7d7e2f1ab
|
// Fixed CSS hover on KPIs
|
2013-10-09 15:46:06 +02:00 |
|
Damien Metzger
|
1870dd4dd2
|
// Added order state color in order::getHistory()
|
2013-10-09 15:33:46 +02:00 |
|
Jerome Nadaud
|
c8347cbc59
|
// Restore save button on header toolbar
|
2013-10-09 15:24:19 +02:00 |
|
Jerome Nadaud
|
f5452aea66
|
// Products fix
|
2013-10-09 15:23:44 +02:00 |
|
Jerome Nadaud
|
61f3c61e2a
|
// Some fix
|
2013-10-09 15:22:27 +02:00 |
|
Jerome Nadaud
|
81677cff44
|
// Toolbar improvement
|
2013-10-09 15:18:54 +02:00 |
|
Damien Metzger
|
a2371067bf
|
// CSS fixes
|
2013-10-09 15:11:04 +02:00 |
|
Damien Metzger
|
9fcb039068
|
// A few CSS fixes
|
2013-10-09 14:57:15 +02:00 |
|
Rémi Gaillard
|
6f1cdba40e
|
// typo
|
2013-10-09 14:56:41 +02:00 |
|
Jerome Nadaud
|
4242e485c7
|
// Bootstrap design on getPath
|
2013-10-09 14:25:46 +02:00 |
|
Jerome Nadaud
|
a1ced4ee32
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-09 14:07:17 +02:00 |
|