pandorafms/pandora_console/godmode
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
..
agentes Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-03 10:24:01 +01:00
alerts Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop' 2021-11-26 07:58:38 +00:00
category Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
db Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
events Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
gis_maps Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
groups Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
massive Added help tip to percentage token 2021-11-30 12:12:24 +01:00
module_library Added standard headers 2021-04-30 14:35:54 +02:00
modules Added help tip to percentage token 2021-11-30 12:12:24 +01:00
netflow Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
reporting report for ncm simple 2021-11-29 15:26:19 +01:00
servers Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
setup fix setup centraliced active directory 2021-11-23 10:18:20 +01:00
snmpconsole Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
tag Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
um_client repoDisk patch (MC => Nodes) 2021-11-26 12:36:49 +00:00
update_manager Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
users Merge branch 'ent-8125-Usuarios-globales-se-borran-si-les-borras-todos-los-perfiles' into 'develop' 2021-11-16 14:55:05 +00:00
wizards Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-26 14:21:40 +02:00
admin_access_logs.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
audit_log_csv.php Updated copyrights 2020-11-27 13:52:35 +01:00
extensions.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
menu.php Fix duplicated ACL setup update manager 2021-11-18 12:25:14 +01:00