 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 |
|
|
Rémi Gaillard
|
302d5f94dd
|
// grmbl
|
2013-09-06 18:33:19 +02:00 |
|
|
Damien Metzger
|
a10b5a517f
|
// Added visits to chart
|
2013-09-06 17:56:26 +02:00 |
|
|
Jerome Nadaud
|
f6355ff2d5
|
[-] BO : Change categories tree method
|
2013-09-06 17:09:32 +02:00 |
|
|
Jerome Nadaud
|
c7e4f0ce5f
|
[+] BO : Adding Tree Helper
|
2013-09-06 17:06:19 +02:00 |
|
|
Jerome Nadaud
|
36a863df59
|
[+] BO : Adding Tree Helper
|
2013-09-06 17:05:19 +02:00 |
|
|
Damien Metzger
|
8df63f256d
|
// Added chart data
|
2013-09-06 16:25:51 +02:00 |
|
|
Kevin Granger
|
fa198aeabc
|
// fix menu, design, css
|
2013-09-06 16:25:01 +02:00 |
|
|
Kevin Granger
|
8e1250dad1
|
// I hate <br />
|
2013-09-06 11:13:18 +02:00 |
|
|
Kevin Granger
|
1b2bab6943
|
// performance
|
2013-09-06 11:03:36 +02:00 |
|
|
Kevin Granger
|
5afdc024aa
|
// navigation sidebar
|
2013-09-06 09:48:22 +02:00 |
|
|
Vincent Augagneur
|
79677324b6
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-05 19:11:07 +02:00 |
|
|
Vincent Augagneur
|
3c2a086296
|
//merge
|
2013-09-05 19:10:59 +02:00 |
|
|
Kevin Granger
|
b2fd886722
|
// add new tpl for navigation top/side
|
2013-09-05 19:07:57 +02:00 |
|
|
Vincent Augagneur
|
4b2ef10dd6
|
//dashboard data-chart-line added
|
2013-09-05 19:07:49 +02:00 |
|
|
Rémi Gaillard
|
a3233cc00c
|
//
|
2013-09-05 18:51:53 +02:00 |
|
|
Rémi Gaillard
|
c35d8c7845
|
//
|
2013-09-05 18:47:13 +02:00 |
|
|
Rémi Gaillard
|
f5e00a59f7
|
//
|
2013-09-05 18:41:51 +02:00 |
|
|
Rémi Gaillard
|
8868271c07
|
// push changes
|
2013-09-05 18:37:25 +02:00 |
|
|
Vincent Augagneur
|
e7495f3fe4
|
//oups
|
2013-09-05 17:38:17 +02:00 |
|
|
Damien Metzger
|
2ff2a6b6f9
|
// Profiling adapted to the new dashboard
|
2013-09-05 17:28:05 +02:00 |
|
|
Vincent Augagneur
|
06b54d0519
|
//typo
|
2013-09-05 16:35:15 +02:00 |
|
|
Vincent Augagneur
|
4124a48b1e
|
//added check on range picker if date from is superior than date to
|
2013-09-05 16:34:03 +02:00 |
|