Damien Metzger
|
481dc3d307
|
// Dashboard is almost complete
|
2013-09-12 18:24:17 +02:00 |
|
Damien Metzger
|
278cd952e2
|
// Gapi choose between 1.3 and 3.0 versions
|
2013-09-12 18:24:17 +02:00 |
|
Jerome Nadaud
|
14a9d914d8
|
// Fix module uninstall button
|
2013-09-12 18:23:27 +02:00 |
|
Jerome Nadaud
|
81b6ec93f9
|
// Add count down to text input
|
2013-09-12 17:59:25 +02:00 |
|
Jerome Nadaud
|
039955e6a1
|
// Fix bug customer list in multistore
|
2013-09-12 16:59:25 +02:00 |
|
Jerome Nadaud
|
29db737c10
|
// Add autosize to textarea
|
2013-09-12 16:52:55 +02:00 |
|
Jerome Nadaud
|
ba6699a378
|
// Fix Admin access
|
2013-09-12 15:55:14 +02:00 |
|
Jerome Nadaud
|
c105486fa3
|
// Tree bugs
|
2013-09-12 15:22:47 +02:00 |
|
Jerome Nadaud
|
bc221b993b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-12 14:55:58 +02:00 |
|
Jerome Nadaud
|
873eee8ad0
|
// Tree list bug
|
2013-09-12 14:55:45 +02:00 |
|
Damien Metzger
|
c2d15f4ade
|
// Changed language display in back office dropdown menu
|
2013-09-12 14:53:12 +02:00 |
|
Jerome Nadaud
|
e63ce0a86d
|
// Tree
|
2013-09-12 14:47:47 +02:00 |
|
Kevin Granger
|
91d3da310b
|
// dashboard panel version
|
2013-09-12 14:42:20 +02:00 |
|
Kevin Granger
|
a1b0710f85
|
// fix menu + sass refacto
|
2013-09-12 12:26:08 +02:00 |
|
Vincent Augagneur
|
4a6c5979a8
|
//added new useful links on dashboard
|
2013-09-12 10:52:56 +02:00 |
|
Vincent Augagneur
|
6fa398e8e0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-12 10:08:32 +02:00 |
|
Vincent Augagneur
|
38822bfb5e
|
//dashactivity configuration
|
2013-09-12 10:08:28 +02:00 |
|
Jerome Nadaud
|
e9dbadcabf
|
// Tree
|
2013-09-11 20:41:14 +02:00 |
|
Kevin Granger
|
ab8d5bc265
|
// VT theme
|
2013-09-11 18:17:57 +02:00 |
|
Kevin Granger
|
18212420c3
|
// fix switch menu top // side
|
2013-09-11 17:26:44 +02:00 |
|
Damien Metzger
|
739d1434b5
|
// Small fix
|
2013-09-11 17:02:44 +02:00 |
|
Kevin Granger
|
99263a1492
|
// switch menu top // side
|
2013-09-11 16:56:10 +02:00 |
|
Damien Metzger
|
ddd7ed2d2b
|
// Connected traffic sources to analytics (dashboard)
|
2013-09-11 16:43:24 +02:00 |
|
Jerome Nadaud
|
7909a7388c
|
//Fix disabled categories with add parameter
|
2013-09-11 15:41:08 +02:00 |
|
Jerome Nadaud
|
617b58ba2f
|
//Fix Text input desc error
|
2013-09-11 15:40:21 +02:00 |
|
Jerome Nadaud
|
49c9afec40
|
// Categories tree
|
2013-09-11 15:08:24 +02:00 |
|
Damien Metzger
|
0ff6b25f56
|
// Fixed norm
|
2013-09-11 14:15:56 +02:00 |
|
Damien Metzger
|
981ce70594
|
// Added realtime Analytics to the dashboard (private beta only at this time)
|
2013-09-11 14:07:56 +02:00 |
|
Vincent Augagneur
|
937ce38a1f
|
//added dashactivity config
|
2013-09-11 12:25:07 +02:00 |
|
Kevin Granger
|
913ee1007c
|
// menu top
|
2013-09-11 11:32:06 +02:00 |
|
Vincent Augagneur
|
486bb58bf6
|
//added dashboard widget config toggle display
|
2013-09-11 11:07:38 +02:00 |
|
Vincent Augagneur
|
3cc187a716
|
//dashactivity trafic source data_list & pie_chart
|
2013-09-11 10:34:01 +02:00 |
|
Kevin Granger
|
f29b1b3a31
|
// perts fix + menu top WIP
|
2013-09-10 20:23:06 +02:00 |
|
Jerome Nadaud
|
e0d33eae9e
|
// Categories Tree changes
|
2013-09-10 18:40:05 +02:00 |
|
Vincent Augagneur
|
1aba28ff6f
|
//typo
|
2013-09-10 16:42:54 +02:00 |
|
Jerome Nadaud
|
7990db8b0c
|
// Tree folders icon problem
|
2013-09-10 14:34:48 +02:00 |
|
Jerome Nadaud
|
85dc552667
|
// Toolbar
|
2013-09-10 14:08:29 +02:00 |
|
Kevin Granger
|
03d1697e19
|
// treeview helper
|
2013-09-10 09:41:39 +02:00 |
|
Damien Metzger
|
1d8da79507
|
[-] BO : fixed notifications when there is too much data
|
2013-09-10 09:17:54 +02:00 |
|
Kevin Granger
|
2a7bc49190
|
// treeview
|
2013-09-09 19:03:38 +02:00 |
|
Jerome Nadaud
|
e91460b8fe
|
[-] BO : Change Nested categories
|
2013-09-09 18:58:32 +02:00 |
|
Jerome Nadaud
|
4e8658f1d6
|
[+] BO : Helper Tree js improvement
|
2013-09-09 18:57:42 +02:00 |
|
Vincent Augagneur
|
b6e0583af8
|
//added security check on dashboard
|
2013-09-09 18:47:15 +02:00 |
|
Vincent Augagneur
|
4e1a513371
|
//added rss and useful link on dashboard
|
2013-09-09 18:44:34 +02:00 |
|
Kevin Granger
|
69b38f4d6f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
|
2013-09-09 18:13:49 +02:00 |
|
Kevin Granger
|
7774e46cb3
|
// tree view product
|
2013-09-09 18:12:31 +02:00 |
|
Jerome Nadaud
|
7bb295b076
|
//
|
2013-09-09 16:21:32 +02:00 |
|
Vincent Augagneur
|
c18dea7296
|
//carrier wizard fix - bootstrap compatibility
|
2013-09-09 14:14:57 +02:00 |
|
Jerome Nadaud
|
accd2d77c1
|
[+] BO : Adding tree templates and functions
|
2013-09-09 12:20:58 +02:00 |
|
Jerome Nadaud
|
b5f6e8a1d8
|
[+] BO : Add "tree-selected" class to tree.js
|
2013-09-09 12:10:26 +02:00 |
|