danielmaya 3ffd976365 resolved conflicts in ver_agente		2018-11-07 12:31:54 +01:00
..
agentes	resolved conflicts in ver_agente	2018-11-07 12:31:54 +01:00
events	Merge branch '2723-Fallo-hint-en-eventos' into 'develop'	2018-10-25 12:07:58 +02:00
gis_maps	…
incidents	Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'	2018-10-29 09:17:54 +01:00
messages	Well centered message modal window - #2768	2018-11-02 13:07:38 +01:00
netflow	…
reporting	…
servers	…
snmpconsole	Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP	2018-10-25 17:43:28 +02:00
tree	…
users	Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop'	2018-11-06 17:08:54 +01:00
visual_console	Fixed margin in public visual consoles	2018-10-11 14:51:52 +02:00
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	…
search_modules.php	…
search_reports.getdata.php	…
search_reports.php	…
search_results.php	…
search_users.getdata.php	…
search_users.php	…
system_alert.php	estilos popup	2018-10-25 14:01:12 +02:00
tree.php	…