Commit Graph

4778 Commits

Author SHA1 Message Date
Daniel Maya b010965caa #9662 Fixed tactical view 2023-02-13 14:44:32 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Pablo Aragon 5b538920f0 Merge branch 'ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms 2023-02-07 11:22:20 +01:00
Matias Didier 1d9c3a5f29 Merge branch 'ent-10249-guardia-problemas-en-grupos-anidados-para-visualizar-modulos-criticos' into 'develop'
Ent 10249 guardia problemas en grupos anidados para visualizar modulos criticos

See merge request artica/pandorafms!5486
2023-02-07 09:57:37 +00:00
alejandro.campos@artica.es 1998829b85 Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-06 14:02:39 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Daniel Maya 5d3b21b36d #10249 Fixed groups 2023-02-03 11:07:52 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Jose Gonzalez 2c8c1d4593 Minor fixes and improvements 2023-02-01 15:14:32 +01:00
alejandro.campos@artica.es 4d24f281fe fixed minor bug 2023-02-01 14:56:30 +01:00
alejandro.campos@artica.es e4f5a9a61a Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-01 09:36:42 +01:00
Matias Didier 6d2f4d7eac Merge branch 'ent-10208-sound-events-antiguo-aun-se-puede-usar-en-nodo' into 'develop'
remove old format events sounds pandora_enterprise#10208

See merge request artica/pandorafms!5468
2023-02-01 07:18:29 +00:00
Matias Didier 08ca68a663 Merge branch 'ent-10274-Overview-de-alertas-no-muestra-correctamente-las-alertas' into 'develop'
fixed filter

See merge request artica/pandorafms!5480
2023-02-01 07:05:49 +00:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Diego Muñoz-Reja ea8b5d68d7 Merge branch 'ent-9270-dos-mejoras-en-el-interface-view' into 'develop'
Ent 9270 dos mejoras en el interface view

See merge request artica/pandorafms!5428
2023-01-31 11:10:19 +00:00
alejandro.campos@artica.es 7d7ee65c7b fixed filter 2023-01-31 11:51:00 +01:00
Jonathan 45b67b1f7a #9270 Icon for InOctets and OutOctets graph 2023-01-31 09:32:06 +01:00
Jonathan bb95dadb4f Merge branch 'develop' into ent-9270-dos-mejoras-en-el-interface-view 2023-01-31 09:26:27 +01:00
Jonathan 89442c3ef9 #10153 regenerate build:watch 2023-01-30 17:06:24 +01:00
Jonathan c75a49c6ec #9270 InOctets and outOctets must be enabbled for graph 2023-01-30 17:01:06 +01:00
Jose Gonzalez 6496c08f28 Polish TreeView 2023-01-30 13:39:27 +01:00
Diego Muñoz-Reja 5a3a86dd02 Merge branch 'ent-7172-11510-anadir-agent-name-a-eventos-rss' into 'develop'
Ent 7172 11510 anadir agent name a eventos rss

See merge request artica/pandorafms!5422
2023-01-30 08:17:39 +00:00
daniel 95575b4e90 remove old format events sounds pandora_enterprise#10208 2023-01-27 12:37:25 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
Jonathan a5852f3060 Merge branch 'develop' into ent-10153-el-modo-mantenimiento-en-url-anonima-compartida-no-funciona 2023-01-24 16:44:00 +01:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Rafael Ameijeiras 1ed1b19cd0 Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop'
Fix list all private dashboards on user edition

See merge request artica/pandorafms!5320
2023-01-24 11:59:23 +00:00
Calvo 63806556de Fix user dashboard homescreen permissions 2023-01-24 10:12:37 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Calvo e1fd9577b6 Added tooltip monitors view 2023-01-20 08:02:58 +01:00
alejandro.campos@artica.es 67b7234e58 implement filter save and load feature in monitor view 2023-01-19 10:49:48 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Jonathan 532a90252c #9270 upgrades interface view + show interface on agent view 2023-01-18 13:44:40 +01:00
Daniel Maya 04e039c515 resolved conflict 2023-01-18 11:31:26 +01:00
Daniel Maya 0f42a5fa88 #9783 Fixed networkmap 4 2023-01-18 11:29:06 +01:00
Jonathan 1513736c90 #7172 RSS add agent_name 2023-01-17 10:14:22 +01:00
Jonathan 6d465add5c #7172 RSS add agent_name 2023-01-17 10:10:59 +01:00
Daniel Rodriguez a165eec2a1 Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop'
Move inventory to open

See merge request artica/pandorafms!5105
2023-01-16 13:43:19 +00:00
Jonathan 27c2aa7c94 10153 Maintenance for visual console public link 2023-01-16 14:18:21 +01:00
Jose Gonzalez 8c852fb3df Agent improvements 2023-01-16 01:28:53 +01:00