pandorafms/pandora_console/operation
Alejandro Gallardo Escobar 265dda2a3f Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
..
agentes Fixed some php notices 2015-01-16 17:14:49 +01:00
events Added api for metaconsole. Ticket: 2014-12-15 19:39:05 +01:00
gis_maps Improved the agent info bubble returned via ajax. Ticket 2014-12-04 16:39:29 +01:00
incidents
integria_incidents
messages
netflow
reporting Fixed ACL errors 2014-10-16 12:21:59 +02:00
servers
snmpconsole
tree
users Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
visual_console Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
extensions.php
menu.php
search_agents.getdata.php
search_agents.php
search_alerts.getdata.php
search_alerts.php
search_graphs.getdata.php
search_graphs.php
search_helps.getdata.php
search_helps.php
search_main.php
search_maps.getdata.php
search_maps.php
search_modules.getdata.php Fixed tickets , . 2014-11-18 11:27:04 +01:00
search_modules.php
search_reports.getdata.php
search_reports.php
search_results.php
search_users.getdata.php
search_users.php
system_alert.php
tree.php Merge branch 'develop' into feature/NewTreeView 2015-01-19 11:47:55 +01:00
tree2.php Modifications on the search filter 2015-01-12 11:04:16 +01:00