pandorafms/pandora_console/operation
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +01:00
..
agentes Merge branch 'ent-8169-No-funciona-recursión-de-grupos-en-vista-de-Monitores-de-Metaconsola' into 'develop' 2021-11-16 09:12:40 +00:00
dashboard Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 2021-05-25 13:50:17 +00: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
incidents Merge branch 'ent-4710-Posibilidad-de-anadir-archivos-adjuntos-en-creacion-de-ticket-en-integracion-con-Integria' into 'develop' 2021-11-15 11:23:34 +00:00
messages Notifications in MC 2021-08-12 12:01:24 +02:00
netflow Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
network Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
reporting Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
servers Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
snmpconsole Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
tree
users #8040 resolved conflict 2021-11-15 13:20:43 +01:00
visual_console Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
menu.php Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 2021-11-15 11:24:50 +00:00
search_agents.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_agents.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_alerts.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_alerts.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_graphs.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_graphs.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_helps.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_helps.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_main.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_maps.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_maps.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_modules.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_modules.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_policies.getdata.php Fixed some errors and fixed issue finding policies 2021-05-24 11:01:50 +02:00
search_policies.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_reports.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_reports.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_results.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_users.getdata.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
search_users.php Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
system_alert.php Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
tree.php Fix select fields size 2021-09-20 12:16:08 +02:00