Alejandro Gallardo Escobar
|
5fb3e94203
|
Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
pandora_console/include/ajax/tree.ajax.php
|
2014-12-18 14:48:18 +01:00 |
|
Alejandro Gallardo Escobar
|
93b248bf14
|
Preparing the element detail output for the tree view
|
2014-12-18 14:40:29 +01:00 |
mdtrooper
|
c18b0b6066
|
Added ajax call for the stats. And fixed the function 'groups_agent_ok' in functions_groups.php
|
2014-12-18 14:25:38 +01:00 |
|
Alejandro Gallardo Escobar
|
a045faeb6d
|
Minor changes
|
2014-12-18 09:55:54 +01:00 |
|
mdtrooper
|
3556621cf0
|
Changed code for to run with Alex's code
|
2014-12-17 19:56:42 +01:00 |
|
mdtrooper
|
9c60470d49
|
Working in the new code of treeview
|
2014-12-17 19:00:48 +01:00 |
|
mdtrooper
|
48991738ca
|
Working in the new code of treeview
|
2014-12-16 16:39:00 +01:00 |