Alejandro Gallardo Escobar
|
530454ea72
|
Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
pandora_console/include/javascript/tree/TreeController.js
|
2014-12-17 19:13:23 +01:00 |
|
Alejandro Gallardo Escobar
|
304b36b13a
|
Too lazy to explain
|
2014-12-17 19:11:07 +01:00 |
mdtrooper
|
9c60470d49
|
Working in the new code of treeview
|
2014-12-17 19:00:48 +01:00 |
|
Alejandro Gallardo Escobar
|
283dfb3160
|
Added new parameters and an icon to the tree root
|
2014-12-17 13:48:17 +01:00 |
|
Alejandro Gallardo Escobar
|
daca918ee6
|
Updated the tree style
|
2014-12-16 19:57:48 +01:00 |
|
Alejandro Gallardo Escobar
|
a70df3c3e4
|
Added a new controller to process and show the tree data
|
2014-12-16 18:32:01 +01:00 |