Daniel Rodriguez 485220a527 Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop' ... implemented new server file editor See merge request artica/pandorafms!3495		2021-01-25 10:17:35 +01:00
..
agentes	Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3	2021-01-14 09:22:06 +01:00
alerts	Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop'	2021-01-25 10:02:41 +01:00
category	Updated copyrights	2020-11-27 13:52:35 +01:00
db	Updated copyrights	2020-11-27 13:52:35 +01:00
events	Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3	2021-01-18 11:48:51 +01:00
gis_maps	changed behavior of All group and fixed acl vulnerability	2021-01-20 18:22:43 +01:00
groups	Merge branch 'develop' into 'ent-1175-copyright-actualizados'	2020-12-14 11:10:35 +01:00
massive	Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery	2021-01-07 10:50:57 +01:00
module_library	Updated copyrights	2020-11-27 13:52:35 +01:00
modules	Merge branch 'develop' into 'ent-1175-copyright-actualizados'	2020-12-23 06:48:22 +01:00
netflow	Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3	2021-01-14 09:22:06 +01:00
reporting	Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3	2021-01-14 09:22:06 +01:00
servers	Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop'	2021-01-25 10:17:35 +01:00
setup	Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico	2021-01-07 10:42:29 +01:00
snmpconsole	changed behavior of All group and fixed acl vulnerability	2021-01-20 18:22:43 +01:00
tag	Updated copyrights	2020-11-27 13:52:35 +01:00
update_manager	Updated copyrights	2020-11-27 13:52:35 +01:00
users	Merge branch 'develop' into 'ent-1175-copyright-actualizados'	2020-12-23 06:48:22 +01:00
wizards	Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop'	2021-01-14 14:43:42 +01:00
admin_access_logs.php	Updated copyrights	2020-11-27 13:52:35 +01:00
audit_log_csv.php	Updated copyrights	2020-11-27 13:52:35 +01:00
extensions.php	Updated copyrights	2020-11-27 13:52:35 +01:00
menu.php	remove IPAM to extension	2021-01-14 14:42:18 +01:00