Commit Graph

2593 Commits

Author SHA1 Message Date
Daniel Cebrian 83e9332e53 #13066 fixed modal in retine screen 2024-03-13 16:53:43 +01:00
Jonathan bcd31a10bc #12497 dots new links 2024-03-12 13:16:16 +01:00
Daniel Cebrian b96cd85b09 #12999 fixed window in firefox 2024-03-08 10:02:22 +01:00
Daniel Cebrian df92200c09 #12999 fixed margin height 2024-03-08 09:40:40 +01:00
Daniel Cebrian 749fd9243c #12999 resize window when change scale 2024-03-08 09:21:09 +01:00
Daniel Cebrian 09880cadf1 #12999 fixed modal resize 2024-03-07 17:58:56 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop'
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
2024-02-22 16:21:32 +00:00
Rafael Ameijeiras f9b6008296 Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop'
Ent 12497 usabilidad implementar boton mas operaciones

See merge request artica/pandorafms!6955
2024-02-22 16:20:13 +00:00
Jonathan 1bdddac95e #12497 dots agent view 2024-02-20 13:33:36 +01:00
Jonathan a050c40976 #12524 blank and send parameters on control + click 2024-02-20 08:26:02 +01:00
Jonathan 5dd9acb02b #12524 disable auto start alerts 2024-02-15 13:54:14 +01:00
Jonathan 097f945a7a Merge branch 'develop' into ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas 2024-02-15 11:44:30 +01:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
miguel angel rasteu 301ca0f710 #12866 Fix Other OS name and version in Agent view 2024-02-12 09:42:20 +01:00
Jonathan d590961e69 #12695 wip removing warnings 2024-02-09 13:51:56 +01:00
Jonathan 6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Jonathan c07ecff571 #12807 check id_agent for alert view 2024-01-26 08:13:10 +01:00
Diego Muñoz-Reja 43cb4878cc Merge branch 'ent-12518-campo-personalizado-de-enlace-web-desde-agente-software-codifica-mal-al-guardar-en-base-de-datos' into 'develop'
Ent 12518 campo personalizado de enlace web desde agente software codifica mal al guardar en base de datos

See merge request artica/pandorafms!6732
2024-01-23 11:28:59 +00:00
Rafael Ameijeiras 30f6e9ea36 Merge branch 'ent-12539-mostrar-dialogo-con-retardo-de-cierre-en-vista-ppal-de-agente' into 'develop'
Ent 12539 mostrar dialogo con retardo de cierre en vista ppal de agente

See merge request artica/pandorafms!6807
2024-01-23 07:27:34 +00:00
Rafael Ameijeiras d98c264640 Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop'
Ent 11900 16100 contador de items en distintas vistas

See merge request artica/pandorafms!6792
2024-01-18 12:53:43 +00:00
Jonathan 4ce970eab1 #12539 fix dialog 2024-01-18 11:26:38 +01:00
Daniel Cebrian 70f213811e #12716 fixed permission in monitor detail 2024-01-02 11:18:53 +01:00
Jonathan a29452de3d #12539 1 sec to 4 sec ok button 2023-12-22 13:12:55 +01:00
Daniel Maya 7390336da0 #12697 Fixed search 2023-12-22 12:55:21 +01:00
Jonathan 6a7eca83df #12539 message 200 modules agent 2023-12-22 12:16:34 +01:00
Jonathan d68daca985 #11900 counter items 2023-12-19 16:50:36 +01:00
daniel e07f66885d Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde
Conflicts:
	pandora_console/index.php
2023-12-19 14:56:04 +01:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
Daniel Maya 971db37147 #12649 remove trace 2023-12-15 10:19:52 +01:00
daniel 70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
Diego Muñoz-Reja b545cfec23 Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop'
Optimiized monitors view

See merge request artica/pandorafms!6627
2023-12-15 07:18:13 +00:00
daniel 2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-14 11:05:29 +01:00
Jonathan 5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +01:00
daniel cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
Jonathan 5279bb3e17 Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes 2023-12-13 08:24:43 +01:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
2023-12-11 14:27:39 +00:00
daniel a418673489 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-11 11:09:54 +01:00
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +01:00
Rafael Ameijeiras 1e2f573a3b Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop'
Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona

See merge request artica/pandorafms!6673
2023-12-11 08:28:56 +00:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-05 08:02:55 +01:00
Jorge Rincon cc1c138552 #12518 Fixed up custom field type link 2023-12-04 11:23:43 +01:00
Jonathan 1fb98d34ae #12296 fix conflict merge develop 2023-12-01 11:59:03 +01:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
Jorge Rincon 03fea82124 #12524 fixed opening items in new tabs Monitoring and Alerts view 2023-11-30 08:45:34 +01:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +01:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop'
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
2023-11-29 14:26:53 +00:00