manuel 1acde54a3f Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup ... Conflicts: pandora_console/install.php Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9		2019-03-11 09:46:59 +01:00
..
agentes	Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'	2019-03-08 10:34:44 +01:00
alerts	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
category	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
db	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
events	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
gis_maps	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
groups	Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None	2019-02-07 08:59:45 +01:00
massive	Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'	2019-03-08 10:34:44 +01:00
modules	fixed minor error	2019-03-07 14:52:31 +01:00
netflow	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
reporting	Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'	2019-02-20 16:37:03 +01:00
servers	Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'	2019-02-27 09:58:42 +01:00
setup	Fixed minor errors in setup_ehorus	2019-03-11 09:37:08 +01:00
snmpconsole	new header and menu	2019-02-25 12:23:15 +01:00
tag	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
update_manager	Added changes	2019-02-13 12:21:31 +01:00
users	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
wizards	minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references	2019-03-01 11:08:49 +01:00
admin_access_logs.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
audit_log_csv.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
extensions.php	Changed the format of the .php files	2019-01-30 16:18:44 +01:00
menu.php	new header and menu	2019-02-26 10:43:59 +01:00