daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales ... Conflicts: pandora_console/godmode/agentes/module_manager_editor_common.php pandora_console/godmode/modules/manage_network_components_form_common.php		2017-11-30 16:29:00 +01:00
..
DEBIAN	Auto-updated build strings.	2017-11-30 00:01:12 +01:00
attachment	…
extensions	Merge branch '1263-Mensajes-de-Visor-de-logs-del-sistema' into 'develop'	2017-11-29 17:03:42 +01:00
extras	Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop'	2017-11-30 13:31:48 +01:00
fonts	…
general	Disable autorefresh on new dashboard view - #1527	2017-11-07 11:19:31 +01:00
godmode	Merge branch 'develop' into 1483-Cuadro_de_umbrales	2017-11-30 16:29:00 +01:00
images	Added new option to networkmap, reset	2017-11-07 15:05:31 +01:00
include	Merge branch 'develop' into 1483-Cuadro_de_umbrales	2017-11-30 16:29:00 +01:00
mobile	…
operation	optimization view events	2017-11-30 14:00:08 +01:00
.gitignore	…
AUTHORS	…
COPYING	…
DB_Dockerfile	…
Dockerfile	…
ajax.php	…
docker_entrypoint.sh	…
index.php	…
install.php	Auto-updated build strings.	2017-11-30 00:01:12 +01:00
install.php.orig	…
pandora_console.redhat.spec	Auto-updated build strings.	2017-11-30 00:01:12 +01:00
pandora_console.redhat.spec.orig	…
pandora_console.spec	Auto-updated build strings.	2017-11-30 00:01:12 +01:00
pandora_console.spec.orig	…
pandora_console_install	Updated version and build strings.	2017-11-27 12:24:02 +01:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop'	2017-11-30 13:31:48 +01:00
pandoradb_data.sql	Updated to MR 9	2017-11-15 11:15:12 +01:00