tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,323 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

17480 Commits

Author SHA1 Message Date
artica 550f16d056 Auto-updated build strings. 2023-01-30 01:01:47 +01:00
artica c8e43563b9 Auto-updated build strings. 2023-01-29 01:01:25 +01:00
artica eff03dc019 Auto-updated build strings. 2023-01-28 01:01:14 +01:00
daniel 69db3c8031 blink button test sound events pandora_enterprise#10189 2023-01-27 12:44:15 +01:00
daniel 81ae7fdb08 fix filter events sounds pandora_enterprise#10188 2023-01-27 12:41:06 +01:00
Daniel Cebrian 0565168522 #10202 fixed search report sql 2023-01-27 12:25:42 +01:00
Diego Muñoz-Reja 3f000f403a Merge branch 'ent-10087-query-de-grupos-que-se-repite-con-frecuencia' into 'develop' 
fix performance tactical view with admin pandora_enterprise#10087

See merge request artica/pandorafms!5454
 2023-01-27 09:11:45 +00:00
Daniel Maya d687524016 resolved conflict 2023-01-27 10:02:14 +01:00
Rafael Ameijeiras 8215067a1c Merge branch 'ent-9799-derivado-del-trabajo-q-a-766-error-al-cambiar-al-dueno-de-un-evento' into 'develop' 
Ent 9799 derivado del trabajo q a 766 error al cambiar al dueno de un evento

See merge request artica/pandorafms!5410
 2023-01-27 08:25:16 +00:00
artica bf10f2a0f4 Auto-updated build strings. 2023-01-27 01:02:08 +01:00
Rafael Ameijeiras 6dd4fda229 Merge branch 'ent-10222-imagen-en-el-about-no-se-ve' into 'develop' 
Ent 10222 imagen en el about no se ve

See merge request artica/pandorafms!5451
 2023-01-26 15:55:33 +00:00
Rafael Ameijeiras 5a5d7ce6ab Merge branch 'ent-10138-redisenar-estilo-de-instalador-manual' into 'develop' 
Ent 10138 redisenar estilo de instalador manual

See merge request artica/pandorafms!5425
 2023-01-26 15:50:04 +00:00
Daniel Cebrian e8a355870e #10233 fixed filter styles in snmp interfaces wizard 2023-01-26 15:46:02 +01:00
daniel df8cb7f481 fix api call server for module graph pandora_enterprise#10241 2023-01-26 14:17:54 +01:00
Rafael Ameijeiras 1488504e56 Merge branch 'ent-10175-14480-ventana-de-informacion-de-evento-no-se-actualiza-estado-en-la-pestana-general' into 'develop' 
fix validate events pandora_enterprise#10175

See merge request artica/pandorafms!5453
 2023-01-26 12:56:20 +00:00
Rafael Ameijeiras 7c379062cf Merge branch 'ent-10160-stored-cross-site-scripting-vulnerability-in-visual-console-module' into 'develop' 
Ent 10160 stored cross site scripting vulnerability in visual console module

See merge request artica/pandorafms!5447
 2023-01-26 12:55:15 +00:00
Rafael Ameijeiras 7bdfb1a096 Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' 
Added child module delete warning

See merge request artica/pandorafms!5429
 2023-01-26 12:53:03 +00:00
daniel 1ebfc58286 fix diabled and remove agents to policies pandora_enterprise#10084 2023-01-26 13:21:28 +01:00
Daniel Cebrian 96efef07d2 #10115 changed function for control special character in mysql.php 2023-01-26 09:28:29 +01:00
Daniel Cebrian 8fb5fc0d85 #10115 fixed special character in fullname if user have permission 2023-01-26 09:16:02 +01:00
Rafael Ameijeiras c18ace2aae Merge branch 'ent-10152-no-permite-agregar-grupos-a-notificaciones' into 'develop' 
Ent 10152 no permite agregar grupos a notificaciones

See merge request artica/pandorafms!5424
 2023-01-26 07:03:33 +00:00
artica 77cad45a29 Auto-updated build strings. 2023-01-26 01:02:02 +01:00
Calvo 0458f4357e Added recursion to delete modules children warning 2023-01-25 18:03:54 +01:00
alejandro.campos@artica.es ce57a3cc4b minor change 2023-01-25 17:41:46 +01:00
Rafael Ameijeiras fe65f409d0 Merge branch 'ent-10156-14771-custom-report-de-availability-no-se-puede-visualizar-sin-darle-al-boton-update-item' into 'develop' 
Ent 10156 14771 custom report de availability no se puede visualizar sin darle al boton update item

See merge request artica/pandorafms!5423
 2023-01-25 16:21:56 +00:00
Daniel Cebrian 783f9a1793 #10115 fixed login with special character in ldap 2023-01-25 17:01:28 +01:00
daniel 08c902ed60 fix performance tactical view with admin pandora_enterprise#10087 2023-01-25 16:46:13 +01:00
Rafael Ameijeiras 1c726fe91b Merge branch 'ent-8148-vista-auditoria-cambios-de-setup-no-detallados' into 'develop' 
Ent 8148 vista auditoria cambios de setup no detallados

See merge request artica/pandorafms!5396
 2023-01-25 14:37:27 +00:00
Daniel Cebrian 8353a356d8 #10138 changed signature footer 2023-01-25 11:44:00 +01:00
daniel ddebce7a3c fix validate events pandora_enterprise#10175 2023-01-25 11:25:20 +01:00
Daniel Cebrian 614475624c #10138 changed color button and fixed input password 2023-01-25 11:12:20 +01:00
Daniel Cebrian 786d035f85 #10138 refactored 2023-01-25 10:34:18 +01:00
artica f8f505283b Auto-updated build strings. 2023-01-25 01:02:12 +01:00
Jonathan aaccd1c0e0 #10153 upload js after npm run build:watch 2023-01-24 16:46:18 +01:00
Jonathan 83216bc4bf #8148 conflict solution 2023-01-24 16:15:22 +01:00
Daniel Rodriguez 72cbdbd2bb Merge branch 'ent-9218-verificar-y-capar-en-su-caso-que-la-autoprovision-de-agentes-no-funciona-en-la-nms-2' into 'develop' 
Ent 9218 verificar y capar en su caso que la autoprovision de agentes no funciona en la nms 2

See merge request artica/pandorafms!5399
 2023-01-24 14:13:17 +00:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Rafael Ameijeiras 9bf789dd26 Merge branch 'ent-10215-mapa-de-calor-pinchar-en-un-elemeno-de-tipo-agente-no-muestra-info' into 'develop' 
Ent 10215 mapa de calor pinchar en un elemeno de tipo agente no muestra info

See merge request artica/pandorafms!5443
 2023-01-24 12:00:34 +00: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
Rafael Ameijeiras 50a6714ef3 Merge branch 'ent-9941-odometro-no-muestra-el-color-del-modulo-en-la-barra-con-enlace-publico' into 'develop' 
Ent 9941 odometro no muestra el color del modulo en la barra con enlace publico

See merge request artica/pandorafms!5387
 2023-01-24 11:58:19 +00:00
Pablo Aragon 8d7671f35f 10222 Fix image About and black css About 2023-01-24 12:34:04 +01:00
Calvo 5d0826f412 Delete modules with children message 2023-01-24 12:26:49 +01: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
artica 0fcde34980 Auto-updated build strings. 2023-01-24 01:00:16 +01:00
Daniel Cebrian 7163b3d853 #10160 fixed xss vulnerability in visual console name 2023-01-23 16:47:27 +01:00
Daniel Rodriguez 0a4ddc480a Merge branch 'ent-10106-borrar-sesion-de-usuario-cuando-se-borra-un-usuario' into 'develop' 
Ent 10106 borrar sesion de usuario cuando se borra un usuario

See merge request artica/pandorafms!5397
 2023-01-23 15:28:19 +00:00
Rafael Ameijeiras b0167af928 Merge branch 'ent-10103-cambio-en-vista-de-threeshold-de-clusters' into 'develop' 
Ent 10103 cambio en vista de threeshold de clusters

See merge request artica/pandorafms!5390
 2023-01-23 15:28:06 +00:00
Rafael Ameijeiras 1d33c0cb69 Merge branch 'ent-10095-14748-ordenar-alertas-por-fecha-en-detalles-de-alerta' into 'develop' 
Ent 10095 14748 ordenar alertas por fecha en detalles de alerta

See merge request artica/pandorafms!5409
 2023-01-23 15:24:33 +00:00
Diego Muñoz-Reja 681031dae3 Merge branch 'ent-9971-elemento-icon-de-cv-no-se-puede-cambiar-una-vez-creado' into 'develop' 
Ent 9971 elemento icon de cv no se puede cambiar una vez creado

See merge request artica/pandorafms!5430
 2023-01-23 13:44:55 +00:00
Daniel Cebrian 293d067a4d #10162 safe input description in special days 2023-01-23 14:44:10 +01:00
Diego Muñoz-Reja c462f389a4 Merge branch 'ent-10014-filtros-personalizados-para-logviewer' into 'develop' 
Ent 10014 filtros personalizados para logviewer

See merge request artica/pandorafms!5414
 2023-01-23 13:27:11 +00:00
Daniel Maya 5a4d9739d3 #10215 Fixed open heatmap 2023-01-23 13:58:06 +01:00
Daniel Maya 976e21c02e #9924 Fixed visual console links 2 2023-01-23 12:28:42 +01:00
Daniel Maya 6b9cd42a3f #9924 Fixed visual console links 2023-01-23 12:08:29 +01:00
artica 3269b8b5ca Auto-updated build strings. 2023-01-23 01:01:14 +01:00
artica 7a919a406d Auto-updated build strings. 2023-01-22 01:01:20 +01:00
artica 20f66ecdcc Auto-updated build strings. 2023-01-21 01:00:24 +01:00
Daniel Cebrian 290fb23cc5 #10171 fixed SNMP Interface Wizard defaults in performance when create snmp interface wizard 2023-01-20 09:31:02 +01:00
Rafael Ameijeiras 2110be0152 Merge branch 'ent-10009-no-se-lista-ipam-recon-al-crear-custom-netscan' into 'develop' 
Ent 10009 no se lista ipam recon al crear custom netscan

See merge request artica/pandorafms!5432
 2023-01-20 07:26:55 +00:00
Rafael Ameijeiras 1c86b74271 Merge branch 'ent-10196-erro-500-al-visualizar-sql-graph-en-informes' into 'develop' 
fix custom graph sql pandora_enterprise#10196

See merge request artica/pandorafms!5434
 2023-01-20 07:16:47 +00:00
artica 35ce06dc21 Auto-updated build strings. 2023-01-20 01:01:03 +01:00
daniel 3ef4482af2 fix custom graph sql pandora_enterprise#10196 2023-01-19 17:50:27 +01:00
Daniel Cebrian 2816eeb003 #10009 added Recon script in create custom netscan 2023-01-19 13:46:46 +01:00
artica d1fb27f5c4 Updated version and build strings. 2023-01-19 13:00:10 +01:00
Daniel Rodriguez b68965fcbb Merge branch 'ent-8578-estilos-podridos-en-integracion-con-ehorus' into 'develop' 
Fix ehorus fonts and glyphicons

See merge request artica/pandorafms!5420
 2023-01-19 11:43:26 +00:00
Daniel Cebrian cddfcd5f25 #10138 changed position signature in footer 2023-01-19 11:29:26 +01:00
alejandro.campos@artica.es 67b7234e58 implement filter save and load feature in monitor view 2023-01-19 10:49:48 +01:00
Daniel Maya 68eac366dd #9971 Fixed imageSrc 2023-01-19 10:37:52 +01:00
Calvo 8c071532e9 Added child module delete warning 2023-01-19 10:34:13 +01:00
Daniel Rodriguez 6dad3d3499 Merge branch 'ent-9783-errores-en-pruebas-con-el-refresh-de-los-mapas-de-red' into 'develop' 
Ent 9783 errores en pruebas con el refresh de los mapas de red

See merge request artica/pandorafms!5317
 2023-01-19 08:45:23 +00:00
artica c7523467e0 Auto-updated build strings. 2023-01-19 01:00:34 +01:00
Daniel Cebrian 7433d1296e cambiado footer y popup 2023-01-18 19:32:31 +01:00
Daniel Cebrian e0b1acb9c4 #10138 finished step 3 2023-01-18 17:02:23 +01:00
Daniel Cebrian 4e00fe4f83 #10138 changed step 3 2023-01-18 12:08:08 +01:00
Calvo 2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +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
daniel f2a3ce0894 translates pandora_enterprise#10169 2023-01-18 09:32:29 +01:00
artica 2e76f72dd8 Auto-updated build strings. 2023-01-18 01:00:21 +01:00
Daniel Cebrian 88a205322a #10138 step 3 design 2023-01-17 17:57:02 +01:00
Daniel Cebrian e16ef7063a #10152 fixed error 500 message notification groups 2023-01-17 11:17:20 +01:00
Daniel Cebrian bc5e1c7541 #10152 fixed error 500 in notifications group 2023-01-17 11:05:43 +01:00
Daniel Cebrian 3fabe05c6e #10156 fixed error 500 in wizard reporting 2023-01-17 10:25:08 +01:00
artica 2db24935c0 Auto-updated build strings. 2023-01-17 01:00:17 +01:00
Calvo ae4144f3c5 Fix ehorus fonts and glyphicons 2023-01-16 16:57:03 +01:00
Jonathan 904b505803 #9473 total_modules all and id 2023-01-16 16:31:13 +01:00
Daniel Rodriguez 24f219e2ce Merge branch 'ent-10154-no-funciona-la-vista-de-mapa-de-red-preliminar-desde-tarea-discovery' into 'develop' 
Ent 10154 no funciona la vista de mapa de red preliminar desde tarea discovery

See merge request artica/pandorafms!5415
 2023-01-16 14:05:43 +00:00
Daniel Maya eec87fb2de #10032 Fixed config_update_value 2023-01-16 14:51:27 +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
Daniel Maya d56460c8de #10154 Fixed get_discovery_agents 2023-01-16 13:00:10 +01:00
Jonathan f3cd19c315 #10014 New filters log viewer 2023-01-16 11:34:28 +01:00
artica 0722503253 Auto-updated build strings. 2023-01-16 01:00:44 +01:00
artica 1792c3dc6b Auto-updated build strings. 2023-01-15 01:00:53 +01:00
artica 3b0a87e549 Auto-updated build strings. 2023-01-14 01:01:39 +01:00
Diego Muñoz-Reja 0435dc09bb Merge branch 'ent-7386-Ocultar-credenciales-de-acceso-a-la-API' into 'develop' 
Ent 7386 ocultar credenciales de acceso a la api

See merge request artica/pandorafms!4991
 2023-01-13 12:44:32 +00:00
Pablo Aragon 4392bd7fa8 9220 Restrict access to collections with nms license 2023-01-13 12:09:15 +01:00
Daniel Rodriguez 9569e77766 Merge branch 'ent-10052-nodo-ficticio-influye-en-el-estado-del-mapa-de-red' into 'develop' 
Ent 10052 nodo ficticio influye en el estado del mapa de red

See merge request artica/pandorafms!5394
 2023-01-13 09:48:49 +00:00
Daniel Rodriguez 6bae5a03f9 Merge branch 'ent-10123-error-404-en-fichero-chart-umd-js-map' into 'develop' 
Ent 10123 error 404 en fichero chart umd js map

See merge request artica/pandorafms!5405
 2023-01-13 09:48:24 +00:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Daniel Rodriguez c0084ed853 Merge branch 'ent-10129-visual-console-fe-de-errata-en-formulario-create-item-percentile' into 'develop' 
Ent 10129 visual console fe de errata en formulario create item percentile

See merge request artica/pandorafms!5403
 2023-01-13 08:38:17 +00:00
Daniel Cebrian 930fd719ff #9799 fixed show value -1 in Owner value 2023-01-13 09:31:19 +01:00
Calvo ce224d67ba Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2023-01-13 09:08:17 +01:00
Daniel Cebrian 05b8418249 #9799 fixed default value -1 in Owner value 2023-01-13 09:02:40 +01:00
artica 74fd70ca66 Auto-updated build strings. 2023-01-13 01:01:38 +01:00
Daniel Cebrian 57bac825d2 #10095 fixed order last triggered 2023-01-12 16:44:29 +01:00
Daniel Maya baa799007e #10052 Fixed fictional color 2 2023-01-12 16:42:29 +01:00
Daniel Rodriguez 29624c92e8 Merge branch 'ent-9618-ver-la-ip-contra-la-que-se-esta-ejecutado-un-modulo-remoto-en-la-vista-de-agente' into 'develop' 
Ent 9618 ver la ip contra la que se esta ejecutado un modulo remoto en la vista de agente

See merge request artica/pandorafms!5393
 2023-01-12 12:25:35 +00:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Daniel Cebrian 63ee1c1e2f #10123 added file chart.umd.js.map 2023-01-12 11:42:46 +01:00
Daniel Cebrian 4d08ca57b4 #10129 fixed Circular progress bar name 2023-01-12 09:55:07 +01:00
artica 2fb7acc871 Auto-updated build strings. 2023-01-12 01:01:55 +01:00
Daniel Cebrian 3d316dac2a #9218 blocked autoprovision in nms license 2023-01-11 16:04:43 +01:00
Daniel Cebrian a7fccc2f77 #10106 deleted session when user is deleted 2023-01-11 10:59:52 +01:00
Jonathan ceead626ee #8148 viewer log tables changes styles 2023-01-11 09:25:45 +01:00
artica adaa4d47bc Auto-updated build strings. 2023-01-11 01:02:00 +01:00
Daniel Rodriguez 75045df090 Merge branch 'ent-7250-mejoras-en-el-nuevo-editor-de-pandora_server-conf' into 'develop' 
Ent 7250 mejoras en el nuevo editor de pandora server conf

See merge request artica/pandorafms!5385
 2023-01-10 16:20:05 +00:00
Daniel Rodriguez 2f4758009b Merge branch 'ent-9817-duplicado-de-perfiles-al-crear-agente' into 'develop' 
Ent 9817 duplicado de perfiles al crear agente

See merge request artica/pandorafms!5377
 2023-01-10 16:18:24 +00:00
Daniel Maya 0832d9613a #10052 Fixed fictional color 2023-01-10 16:40:53 +01:00
Daniel Rodriguez 172cb38045 Merge branch 'ent-9362-the-tagente_datos-table-contains-too-much-data' into 'develop' 
Ent 9362 the tagente datos table contains too much data

See merge request artica/pandorafms!5375
 2023-01-10 11:38:54 +00:00
Daniel Cebrian f37db99337 #9618 deleted hd() 2023-01-10 11:46:14 +01:00
Jonathan 7bb2293096 #9941 add url pandora_console for odometre 2023-01-10 11:31:09 +01:00
Daniel Cebrian df87c122af added ip in modules list 2023-01-10 10:50:47 +01:00
Pablo Aragon 72acbae5a6 Hide module password value 2023-01-10 10:23:09 +01:00
Daniel Rodriguez b596b895d1 Merge branch 'ent-9679-bug-en-log-de-last-activity-al-iniciar-sesion' into 'develop' 
Ent 9679 bug en log de last activity al iniciar sesion

See merge request artica/pandorafms!5378
 2023-01-10 09:03:37 +00:00
daniel 4d46e0234d fix bundle CV pandora_enterprise#9941 2023-01-10 08:12:02 +01:00
artica 4edcbe49e2 Auto-updated build strings. 2023-01-10 01:01:09 +01:00
Daniel Cebrian acd36289b0 #10103 added module name in A-A THRESHOLDS 2023-01-09 17:17:04 +01:00
daniel fb8c16dbcf fix webpack node last version pandora_enterprise#9941 2023-01-09 17:10:17 +01:00
daniel 4d27310499 fix bundle CV pandora_enterprise#9941 2023-01-09 16:20:40 +01:00
daniel 242f1d046f fix webpack node last version pandora_enterprise#9941 2023-01-09 16:13:54 +01:00
Enrique Martin 851ee9f4d5 Merge branch 'ent-9530-Carrefour-Volver-a-poner-el-cuadro-naranja-en-las-consolas-visuales-cuando-hay-una-alerta' into 'develop' 
implemented alert warning in visual consoles

See merge request artica/pandorafms!5329
 2023-01-09 12:13:20 +00:00
alejandro.campos@artica.es 5b5694c5f6 fixed conflicts 2023-01-09 10:49:11 +01:00
Daniel Rodriguez 5d667f4952 Merge branch 'ent-10119-vista-de-alertas-fallo-en-la-version-open' into 'develop' 
Ent 10119 vista de alertas fallo en la version open

See merge request artica/pandorafms!5381
 2023-01-09 09:26:40 +00:00
Daniel Rodriguez 2fcbdfadc5 Merge branch 'ent-9999-error-agente-apartado-full-list-of-alerts' into 'develop' 
Ent 9999 error agente apartado full list of alerts

See merge request artica/pandorafms!5382
 2023-01-09 09:25:34 +00:00
Jonathan 1fc4af9492 #7250 config pandora_server.conf multiple columns 2023-01-09 09:56:19 +01:00
artica dda9ba4419 Auto-updated build strings. 2023-01-09 01:00:40 +01:00
artica 015e475dcd Auto-updated build strings. 2023-01-08 01:01:00 +01:00
artica 2af44b6b24 Auto-updated build strings. 2023-01-07 01:00:43 +01:00
artica 1071c34d17 Auto-updated build strings. 2023-01-06 01:00:58 +01:00
Daniel Cebrian 889cd81155 #9999 changed limit length when value is -1 2023-01-05 14:33:04 +01:00
Daniel Cebrian a1421b9138 #9999 changed value limit in sql filter 2023-01-05 13:47:51 +01:00
Daniel Cebrian 7906c8fe2f #9999 fixed filter all in alert list 2023-01-05 13:40:59 +01:00
Daniel Maya b4d54fb729 #10119 Fixed alerts table 2023-01-05 13:31:40 +01:00
Enrique Martin f8e3353836 Merge branch 'ent-9787-14480-ventana-de-informacion-de-evento-no-se-actualiza-estado-en-la-pestana-general' into 'develop' 
Ent 9787 14480 ventana de informacion de evento no se actualiza estado en la pestana general

See merge request artica/pandorafms!5379
 2023-01-05 11:50:48 +00:00
Enrique Martin 37b35ee509 Merge branch 'ent-9440-derivado-del-trabajo-q-a-765-api-pfms-set-planned_downtimes_additem-hace-mal-conteo-de' into 'develop' 
Ent 9440 derivado del trabajo q a 765 api pfms set planned downtimes additem hace mal conteo de

See merge request artica/pandorafms!5373
 2023-01-05 11:50:05 +00:00
Enrique Martin 2cf0e301c5 Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop' 
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view

See merge request artica/pandorafms!5369
 2023-01-05 11:46:53 +00:00
Enrique Martin 9ccc4d1531 Merge branch 'ent-9910-bug-visual' into 'develop' 
Ent 9910 bug visual

See merge request artica/pandorafms!5372
 2023-01-05 11:44:16 +00:00
Enrique Martin ca7c745a82 Merge branch 'ent-10075-14724-reporte-en-pdf-no-muestra-de-sla-compliance-y-status' into 'develop' 
Ent 10075 14724 reporte en pdf no muestra de sla compliance y status

See merge request artica/pandorafms!5364
 2023-01-05 11:36:16 +00:00
Jonathan e55d4f3019 #9787 Alert general Acknowledged recovery 2023-01-05 10:36:14 +01:00