artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' ... # Conflicts: # pandora_console/godmode/reporting/visual_console_builder.editor.js # pandora_console/include/functions_visual_map_editor.php # pandora_console/include/graphs/flot/pandora.flot.js		2017-07-28 10:30:17 +02:00
..
agentes	Merge branch '1140-Gráficas_con_entities' into 'develop'	2017-07-28 10:21:04 +02:00
alerts	Changed agent name by alias in alerts details	2017-06-08 17:55:04 +02:00
category	…
db	…
events	…
gis_maps	…
groups	Updated id module group	2017-05-24 16:17:43 +02:00
massive	Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'	2017-07-18 12:24:49 +02:00
modules	Added float parser to module threshold	2017-05-11 10:55:33 +02:00
netflow	…
reporting	Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev'	2017-07-28 10:30:17 +02:00
servers	Remove pandorfms name column link in server manager - #442	2017-06-07 15:05:19 +02:00
setup	Merge branch '1012-Problema-con-configuración-de-LDAP-dev' into 'develop'	2017-07-13 11:56:17 +02:00
snmpconsole	Changed bad jquery get call in alert actions and alerts snmp.	2017-05-08 15:54:35 +02:00
tag	…
update_manager	Merge branch 'develop' into '777-translations-dev'	2017-05-22 17:51:21 +02:00
users	Style change text in user management	2017-06-20 12:01:34 +02:00
admin_access_logs.php	…
audit_log_csv.php	…
extensions.php	…
menu.php	Hide admin tools empty link in left menu bar for operator read users without permissions - #922	2017-05-25 18:37:26 +02:00