Commit Graph

15608 Commits

Author SHA1 Message Date
artica 19b8730c07 Auto-updated build strings. 2021-12-12 01:00:17 +01:00
artica 8ba6a05d1f Auto-updated build strings. 2021-12-11 01:00:19 +01:00
fbsanchez f8883151f3 allow datatable to export all columns but latest one 2021-12-10 13:43:05 +01:00
Daniel Maya 002ae85d64 #8355 replace in_array 2021-12-10 10:58:14 +01:00
Daniel Barbero Martin b55679cbfd Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites 2021-12-10 08:18:46 +01:00
artica 3dd92397f9 Auto-updated build strings. 2021-12-10 01:00:20 +01:00
Daniel Rodriguez 76bcbd3c33 Merge branch 'ent-8324-desincronizacion-entornos-metaconsola-transacciones' into 'develop'
force db_process_sql

See merge request artica/pandorafms!4570
2021-12-09 17:45:43 +00:00
Daniel Rodriguez 92f789945a Merge branch 'ent-8075-Informe-de-acciones-de-alerta' into 'develop'
WIP new report alert fired actions

See merge request artica/pandorafms!4531
2021-12-09 17:31:42 +00:00
alejandro.campos@artica.es d3e99b315f fixed interface wizard selectors 2021-12-09 18:00:39 +01:00
fbsanchez e37cdc4459 Improvements in Entity class 2021-12-09 14:57:37 +01:00
artica e7b1bfd368 Auto-updated build strings. 2021-12-09 01:00:16 +01:00
artica 67c8a846b9 Auto-updated build strings. 2021-12-08 01:00:17 +01:00
Daniel Rodriguez c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop'
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
2021-12-07 16:51:07 +00:00
Daniel Barbero Martin ffc3728f2a fix minor error 2021-12-07 15:50:34 +01:00
Daniel Maya 765a36f913 #8180 Fix map select in metaconsole 2021-12-07 15:48:49 +01:00
Daniel Maya 2e8a1ecdc8 #8195 Fix z-index in full screen mode 2021-12-07 14:11:33 +01:00
fbsanchez 0d08e27865 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-07 13:03:10 +01:00
Daniel Maya e24987d03e #8201 Fix dashboard event dialog 2021-12-07 12:17:26 +01:00
Daniel Barbero Martin c20b3bacc8 wip reports alert actions 2021-12-07 11:00:48 +01:00
Daniel Barbero Martin 118b1e1b80 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-07 08:34:03 +01:00
artica 4925aaae18 Auto-updated build strings. 2021-12-07 01:00:17 +01:00
artica 3e0e41038f Auto-updated build strings. 2021-12-06 01:00:16 +01:00
artica f1482dc812 Auto-updated build strings. 2021-12-05 01:00:17 +01:00
artica fcff0eeafd Auto-updated build strings. 2021-12-04 01:00:20 +01:00
fbsanchez 6d469912fa some fixes 2021-12-03 14:24:00 +01:00
fbsanchez 5b06415235 errata fix 2021-12-03 13:58:14 +01:00
fbsanchez a94f6be37e force db_process_sql 2021-12-03 12:59:50 +01:00
Daniel Maya be587c5294 #8207 Fixed group item 2021-12-03 10:38:27 +01:00
Calvo 7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
Daniel Maya 6ead6b8a48 #8232 Fixed value in password 2021-12-03 09:22:39 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
Daniel Barbero Martin eb8b89f22e wip reports alert actions 2021-12-02 17:17:21 +01:00
Daniel Barbero Martin 5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00
Daniel Barbero Martin 94bd55fd39 wip reports alert actions 2021-12-02 16:55:53 +01:00
Daniel Barbero Martin ec21d9d08a wip reports alert actions 2021-12-02 14:27:24 +01:00
Daniel Barbero Martin d030b3b924 wip reports alert actions 2021-12-02 14:16:01 +01:00
Daniel Barbero Martin abedd87910 wip reports alert actions 2021-12-02 14:04:33 +01:00
Daniel Barbero Martin 751cb7380b wip reports alert actions 2021-12-02 13:52:56 +01:00
Daniel Barbero Martin 9b79fb826d wip reports alert actions 2021-12-02 13:34:28 +01:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
fbsanchez 11c18d9379 minor style changes 2021-12-02 11:10:18 +01:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-02 10:43:30 +01:00
Daniel Barbero Martin b781215b4e Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-02 08:33:02 +01:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
Daniel Barbero Martin a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
Jose Gonzalez 3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
Calvo a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +01:00
Daniel Barbero Martin e3d6d52c14 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-01 08:15:43 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Barbero Martin 6d9b3d209c Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:45:07 +01:00
Daniel Rodriguez e7e8920783 Merge branch 'ent-8307-Supernet-map-Desplegar-elementos' into 'develop'
Ent 8307 supernet map desplegar elementos

See merge request artica/pandorafms!4559
2021-11-30 13:34:04 +00:00
Daniel Barbero Martin 40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
Daniel Barbero Martin 40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
Jose Gonzalez 64e08d7124 Fixed grouped comments with id_agent 2021-11-30 10:50:40 +01:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
Daniel Barbero Martin 33d9db657e wip reports alert actions 2021-11-29 20:45:35 +01:00
Daniel Barbero Martin e8bf86a789 wip reports alert actions 2021-11-29 17:55:09 +01:00
Jose Gonzalez 7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Daniel Maya c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
Daniel Rodriguez 75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop'
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
2021-11-29 11:36:52 +00:00
Daniel Rodriguez 198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop'
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
2021-11-29 11:08:00 +00:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/install.php
2021-11-29 09:54:55 +01:00
Daniel Barbero Martin 75354a97d9 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-29 08:05:45 +01:00
artica 1bbcf965a8 Auto-updated build strings. 2021-11-29 01:00:15 +01:00
artica 7631585546 Auto-updated build strings. 2021-11-28 01:00:16 +01:00
artica 800faaf504 Auto-updated build strings. 2021-11-27 01:00:46 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Daniel Barbero Martin 960c2de6c3 wip reports alert actions 2021-11-26 14:06:10 +01:00
Daniel Barbero Martin be5fe18762 wip reports alert actions 2021-11-26 13:23:46 +01:00
Daniel Barbero Martin 0b04ba44f2 wip reports alert actions 2021-11-26 12:15:39 +01:00
Calvo 54755db59b Control inverse and percentege cannot be selected at same time 2021-11-26 11:55:38 +01:00
Jose Gonzalez 5eb4a869cc Fix issue with metaconsole comments 2021-11-26 11:51:27 +01:00
Daniel Barbero Martin 780d2bf87d wip reports alert actions 2021-11-26 11:43:57 +01:00
Daniel Rodriguez 8fac24a469 Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop'
Ent 8277 12706 lista de alertas no filtra correctamente

See merge request artica/pandorafms!4539
2021-11-26 07:58:38 +00:00
Daniel Barbero Martin 9b62aa11da Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-26 08:16:46 +01:00
artica b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Daniel Barbero Martin dae6182ef0 wip reports alert actions 2021-11-25 17:28:00 +01:00
Jose Gonzalez b151b3996d Fixed issue with events 2021-11-25 13:52:53 +01:00
Daniel Maya 4211327275 #8260 Fixed Integria IMS Ticket edit in metaconsole 2021-11-25 13:17:12 +01:00
Daniel Barbero Martin f7233604fe Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-25 08:19:35 +01:00
Daniel Barbero Martin 8746db24c9 demo 2021-11-25 08:19:05 +01:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
Daniel Rodriguez 5fcabbf959 Merge branch 'ent-7902-Bug-visual-en-modal-de-edición-de-acciones-de-alertas' into 'develop'
Ent 7902 bug visual en modal de edición de acciones de alertas

See merge request artica/pandorafms!4541
2021-11-24 17:20:35 +00:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop'
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
2021-11-24 17:18:38 +00:00
Daniel Rodriguez e3d7134dc8 Merge branch 'ent-8278-No-funcionan-las-gráficas-de-Agente-en-la-versión-Opensource' into 'develop'
Ent 8278 no funcionan las gráficas de agente en la versión opensource

See merge request artica/pandorafms!4538
2021-11-24 14:43:52 +00:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Daniel Maya cfd2fe390e #8263 Fixed status group 2021-11-24 11:40:24 +01:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
Conflicts:
	pandora_console/include/functions_html.php
2021-11-24 08:39:03 +01:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-23 14:29:23 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Rodriguez c096a244f6 Merge branch 'ent-8254-filtro-select-grupo-no-busca-sin-permiso-directo' into 'develop'
Select group search filter working on groups' child

See merge request artica/pandorafms!4535
2021-11-23 09:38:22 +00:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop'
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
2021-11-22 15:54:05 +00:00
Daniel Rodriguez 3efcc8d30f Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop'
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard

See merge request artica/pandorafms!4504
2021-11-22 15:53:16 +00:00
Daniel Maya 131be55be1 #8277 Fixed search by agent 2021-11-22 16:18:53 +01:00
Daniel Rodriguez 13835582d2 Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop'
Ent 8210 bug al editar acciones ya configuradas en alertas

See merge request artica/pandorafms!4536
2021-11-22 12:44:51 +00:00
Daniel Maya 79757d8f4b #8278 Fixed graph 2021-11-22 12:12:32 +01:00
artica 9474dc9dbc Auto-updated build strings. 2021-11-22 01:00:09 +01:00
artica 956e1bd82b Auto-updated build strings. 2021-11-21 01:00:14 +01:00
artica 1751faac96 Auto-updated build strings. 2021-11-20 01:00:24 +01:00
Daniel Maya 8ce1a500ea #8210 Fixed dialog 2021-11-19 14:57:56 +01:00
Daniel Rodriguez 7b4c6848f7 Merge branch 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' into 'develop'
fixed several counts

See merge request artica/pandorafms!4527
2021-11-19 10:46:15 +00:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +01:00
Alejandro Campos 6d1e7121d7 Merge branch 'develop' into 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758'
# Conflicts:
#   pandora_console/include/functions_tactical.php
2021-11-19 08:59:19 +00:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
artica f18a575b2a Auto-updated build strings. 2021-11-19 01:00:17 +01:00
fbsanchez 8346a233be NCM2 2021-11-18 19:49:57 +01:00
Daniel Rodriguez 04e6e875b3 Merge branch 'ent-8168-La-vista-tactica-de-metaconsola-no-tiene-en-cuenta-el-propagate-ACL-de-los-grupos' into 'develop'
fixed propagation in agents count

See merge request artica/pandorafms!4529
2021-11-18 16:36:55 +00:00
alejandro.campos@artica.es 649fc829fb included secondary groups in tactical count queries 2021-11-18 13:35:27 +01:00
Daniel Rodriguez 5b49372e99 Merge branch 'ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into 'develop'
Added missing sec related to GET params  to ACL enterprise

See merge request artica/pandorafms!4345
2021-11-18 12:14:12 +00:00
Daniel Rodriguez 3c71ecfec2 Merge branch 'ent-8069-command-center-anadir-una-notificacion-si-la-cola-de-tareas-de-los-nodos-tiene-un-fallo-o-es' into 'develop'
Notifications if syncqueue exceeds limits in MC

See merge request artica/pandorafms!4515
2021-11-18 12:09:06 +00:00
Calvo 283dadc72d Select group search filter working on groups' child 2021-11-18 11:33:34 +01:00
artica a5cfe3869c Auto-updated build strings. 2021-11-18 01:00:18 +01:00
Calvo 06fe1552bf Enterprise ACL step 2: Add options fix merge 2021-11-17 17:31:43 +01:00
Daniel Rodriguez 908bc22b33 Merge branch 'ent-8052-vista-de-datos-de-modulos-en-agente-tree-view-services-metaconsola' into 'develop'
Fix metaconsole services tree view agent module data popup

See merge request artica/pandorafms!4473
2021-11-17 15:15:13 +00:00
Daniel Rodriguez 3fc8e0cf7f Merge branch 'ent-7994-carrefour-anadir-filtro-en-la-vista-de-custom-field-view-metaconsola' into 'develop'
added search capacity to multiple select

See merge request artica/pandorafms!4459
2021-11-17 15:14:31 +00:00
Daniel Rodriguez 9ba2169de3 Merge branch 'ent-8239-12653-GUARDIA-No-devuelve-valor-SNMP-Interface-wizard-cuando-se-ejecuta-a-traves-de-pandora-exec-proxy-satelite' into 'develop'
Ent 8239 12653 guardia no devuelve valor snmp interface wizard cuando se ejecuta a traves de pandora exec proxy satelite

See merge request artica/pandorafms!4530
2021-11-17 10:20:43 +00:00
artica 7a290bfac6 Auto-updated build strings. 2021-11-17 01:00:19 +01:00
Daniel Rodriguez 3054c2d028 Merge branch 'ent-8124-Administradores-globales-usan-autenticacion-remota' into 'develop'
prevent global admins to log in remotely

See merge request artica/pandorafms!4497
2021-11-16 15:36:36 +00:00
Daniel Rodriguez 7c7402e5fb Merge branch 'ent-8066-errores-ldap-con-simbolos-en-la-pass-PHP' into 'develop'
Fix ldap auth php function passwords with special chars

See merge request artica/pandorafms!4444
2021-11-16 14:12:27 +00:00
Daniel Rodriguez 5782193a38 Merge branch 'ent-8266-Error-sql-en-vista-de-agentes-de-una-política-en-metaconsola' into 'develop'
Ent 8266 error sql en vista de agentes de una política en metaconsola

See merge request artica/pandorafms!4532
2021-11-16 13:17:41 +00:00
Daniel Rodriguez 5264f39065 Merge branch 'ent-7912-12337-Fallo-filtrado-Tree-view-widget-en-Dashboards' into 'develop'
Ent 7912 12337 fallo filtrado tree view widget en dashboards

See merge request artica/pandorafms!4503
2021-11-16 13:15:47 +00:00
Daniel Rodriguez 7e8782f56b Merge branch 'ent-6757-Aumentar-numero-caracteres-en-custom-graphs' into 'develop'
title en ticks bullet charts

See merge request artica/pandorafms!4521
2021-11-16 13:15:20 +00:00
fbsanchez ed4f5845d7 some minor changes 2021-11-16 14:11:54 +01:00
fbsanchez 75f4e86f9e Code highlight 2021-11-16 14:05:02 +01:00
Daniel Rodriguez f2b9d1fbd2 Merge branch 'ent-8134-Tree-View-Tags-Falla-la-búsqueda-por-módulos' into 'develop'
Ent 8134 tree view tags falla la búsqueda por módulos

See merge request artica/pandorafms!4500
2021-11-16 09:14:02 +00:00
artica 7b717bcc6d Auto-updated build strings. 2021-11-16 01:00:20 +01:00
fbsanchez cc859f3978 Entity, allow to duplicate objects 2021-11-15 19:29:37 +01:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
Calvo b6e34a2697 erge remote-tracking branch 'origin/develop' into ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones 2021-11-15 18:14:18 +01:00
Daniel Maya 147b3c4bb2 #8266 Fixed agent view in policies 2021-11-15 17:12:56 +01:00
Daniel Rodriguez 845753112e Merge branch 'ent-8167-usuario-sin-permisos-de-nodo-accede-a-nodo-en-el-primer-enlace' into 'develop'
Fix user acces to node from treeview on meta

See merge request artica/pandorafms!4507
2021-11-15 13:13:34 +00:00
Daniel Rodriguez 8b258f9b5c Merge branch 'ent-8044-Inconsistencia-en-ID-de-eventos-agrupados' into 'develop'
fix wrong event id in grouped events

See merge request artica/pandorafms!4461
2021-11-15 12:24:47 +00:00
Daniel Rodriguez d094987eda Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop'
Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
2021-11-15 11:29:33 +00:00
Daniel Rodriguez c5a86e2782 Merge branch 'ent-7916-Macro-de-agentgroup-en-label-de-informes' into 'develop'
Ent 7916 macro de agentgroup en label de informes

See merge request artica/pandorafms!4489
2021-11-15 11:28:44 +00:00
Daniel Rodriguez eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop'
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
2021-11-15 11:24:50 +00:00
Daniel Rodriguez eb39636c16 Merge branch 'ent-4710-Posibilidad-de-anadir-archivos-adjuntos-en-creacion-de-ticket-en-integracion-con-Integria' into 'develop'
Ent 4710 posibilidad de anadir archivos adjuntos en creacion de ticket en integracion con integria

See merge request artica/pandorafms!4483
2021-11-15 11:23:34 +00:00
Daniel Rodriguez a6fc887613 Merge branch 'ent-8041-Bug-en-item-Module-graph-CV-creados-desde-wizard' into 'develop'
Ent 8041 bug en item module graph cv creados desde wizard

See merge request artica/pandorafms!4471
2021-11-15 11:21:44 +00:00
Daniel Rodriguez 4eb40382dd Merge branch 'ent-8049-Bug-en-widget-Visual-console-de-Dasboards-metaconsola' into 'develop'
Ent 8049 bug en widget visual console de dasboards metaconsola

See merge request artica/pandorafms!4450
2021-11-15 11:20:21 +00:00
Daniel Rodriguez cd2f3b8a54 Merge branch 'ent-8098-Bug-en-filtro-de-Agents/Alerts' into 'develop'
Ent 8098 bug en filtro de agents/alerts

See merge request artica/pandorafms!4470
2021-11-15 11:18:27 +00:00
Daniel Rodriguez c02c03df02 Merge branch 'ent-8099-Vulnerabilidad-JQuery-mobile' into 'develop'
Ent 8099 vulnerabilidad j query mobile

See merge request artica/pandorafms!4498
2021-11-15 11:13:07 +00:00