pandorafms/pandora_console/operation
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
..
agentes Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-14 11:03:04 +01:00
dashboard Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 2021-05-25 13:50:17 +00:00
events Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-02 10:43:30 +01:00
gis_maps Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 2021-11-04 16:28:15 +01:00
incidents Merge branch 'develop' into 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' 2021-11-17 09:48:16 +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 fix chart area 2021-11-23 13:14:56 +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 2013-02-07 Ramon Novoa <rnovoa@artica.es> 2013-02-07 18:21:59 +00:00
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-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 2021-11-22 15:54:05 +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 general search 2021-11-04 18:07:39 +01: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 fixed general search 2021-11-04 18:07:39 +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