pandorafms/pandora_console/godmode
daniel 15ca89068d Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
Conflicts:
	pandora_console/godmode/servers/manage_recontask_form.php
	pandora_console/include/functions_events.php


Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +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 fixed warnings php 2019-02-25 13:02:39 +01:00
massive Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +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 remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +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