Commit Graph

1876 Commits

Author SHA1 Message Date
Daniel Rodriguez a7b5015281 Merge branch 'ent-10972-error-de-visualizacion-en-creacion-de-alerta-correlada-condiciones-en-vista-simple-y-detallada' into 'develop'
Ent 10972 error de visualizacion en creacion de alerta correlada condiciones en vista simple y detallada

See merge request artica/pandorafms!5761
2023-05-16 08:40:15 +00:00
Daniel Rodriguez fe9194eccf Merge branch 'ent-11085-15095-anadir-de-nuevo-la-opcion-insert-edit-link-en-label-settings-de-la-consola-visual-mas' into 'develop'
Ent 11085 15095 anadir de nuevo la opcion insert edit link en label settings de la consola visual mas

See merge request artica/pandorafms!5813
2023-05-12 08:44:48 +00:00
Matias Didier ec2195f32f Merge branch 'ent-11047-15490-no-se-pueden-agregar-mas-campos-a-los-plugins' into 'develop'
Ent 11047 15490 no se pueden agregar mas campos a los plugins

See merge request artica/pandorafms!5780
2023-05-09 08:18:40 +00:00
Jonathan 9da4f3d656 #11085 tinymce add plugins imagen link 2023-05-03 08:04:54 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes'
# Conflicts:
#   pandora_console/include/styles/pandora.css
2023-04-28 08:07:10 +00:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop'
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
2023-04-28 06:04:18 +00:00
Jonathan d1361e38cb #11047 fix macro in plugin section node+meta 2023-04-25 14:20:44 +02:00
Matias Didier d7ee0ca2da Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop'
Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro

See merge request artica/pandorafms!5736
2023-04-24 10:44:21 +00:00
Jonathan 55485c43b2 #10972 remove console.log fullcalendar.js 2023-04-24 07:51:00 +02:00
Jonathan ec1eb38336 #10972 fix null calendar alerts correlation 2023-04-21 13:27:18 +02:00
Jonathan a28aef4050 #10191 fix url sound event on metaconsole 2023-04-21 08:48:19 +02:00
Daniel Rodriguez f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop'
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
2023-04-20 11:51:13 +00:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
Daniel Rodriguez 063dbf07d6 Merge branch 'ent-10564-15146-bug-en-comentarios-de-eventos' into 'develop'
fixed add commet event

See merge request artica/pandorafms!5672
2023-04-19 10:45:50 +00:00
Daniel Maya b39f4a2f04 #10910 Fix old image 2023-04-18 15:14:40 +02:00
Rafael Ameijeiras 852e7ae2a0 Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop'
Ent 10714 mejoras de usabilidad en vista de inventario export csv

See merge request artica/pandorafms!5726
2023-04-17 15:40:19 +00:00
Jonathan cbf122f4c6 #10714 csv inventory button 2023-04-17 14:11:16 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop'
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
2023-04-17 11:06:10 +00:00
Pablo Aragon 0fa03f28b3 10067-Alerts triggered filter tree view 2023-04-16 20:21:29 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
2023-04-13 08:24:18 +00:00
daniel b186d51329 fix icons pandora_enterprise#10909 2023-04-12 17:06:58 +02:00
Daniel Maya cd030620b2 #10909 Fix icon group 4 2023-04-12 15:51:02 +02:00
Jonathan b36ade1821 #10191 fix url event sounds 2023-04-11 16:24:37 +02:00
Jonathan c6c8e60b1d #10191 no show old sound event modal 2023-04-11 15:04:21 +02:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
daniel ba1f299440 fixed add commet event 2023-04-10 10:35:47 +02:00
Pablo Aragon 5f6213f0f0 10863-Buttons Network maps 2023-04-05 14:15:23 +02:00
Rafael Ameijeiras cc2709c42c Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
2023-04-05 06:47:31 +00:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Jonathan 4aaddf063c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 09:52:06 +02:00
Jonathan 93966788eb Slides require mesage 2023-03-31 09:51:48 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan ee0619cc4a Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 16:50:25 +02:00
Jonathan 8c3b5d650d tree view dashboard metaconsole 2023-03-29 16:50:17 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
Daniel Maya 490e547202 #10699 Fixed central node 2023-03-28 11:03:59 +02:00
daniel 3d815d56c8 fixed styles 2023-03-28 08:45:40 +02:00
daniel 4e01838238 fixed styles 2023-03-28 08:43:46 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
2023-03-27 10:43:48 +00:00
Pablo Aragon 95edb47d01 10408 2023-03-24 12:29:03 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon 904b526b30 Change pass login. Graph tree view width 2023-03-22 11:23:07 +01:00
Daniel Cebrian bb794d603b fixed button create tips and icon remove 2023-03-17 09:13:00 +01:00
Jonathan c219ad91c7 Visual minor fix 2023-03-17 08:53:58 +01:00
Daniel Cebrian f8f65bf5a1 fixed icon size 2023-03-16 17:26:48 +01:00
Daniel Cebrian 20b177d121 changed in welcome tips forms 2023-03-16 17:23:48 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00