Commit Graph

29162 Commits

Author SHA1 Message Date
Enrique Martin 4e6bb65790 Debugging rpm generation incompatibility with EL7 binaries 2023-09-28 10:42:39 +02:00
Enrique Martin 59024fa846 Added SAP plugin to MR 2023-09-28 09:18:36 +02:00
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
miguel angel rasteu a4345c8ae4 #11075 Fix apostrophe 2023-09-27 16:08:55 +02:00
Rafael Ameijeiras 6acbc5b684 Merge branch 'ent-12050-security-hardening-console-widget-dashboard' into 'develop'
Ent 12050 Security hardening: Console - Widget dashboard

See merge request artica/pandorafms!6450
2023-09-27 14:07:04 +00:00
alejandro.campos@artica.es 00c48c1c7d implemented cron in open 2023-09-27 11:44:26 +02:00
alejandro.campos@artica.es f5be4cf17c implemented cron in open 2023-09-27 11:42:21 +02:00
alejandro.campos@artica.es 57a0249982 implmented cron in open 2023-09-27 11:38:00 +02:00
alejandro.campos@artica.es 831ed2570d implemented cron in open 2023-09-27 11:35:57 +02:00
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +02:00
Jorge Rincon d1f2fa4b44 #12113 Set select to close when an option is chosen 2023-09-27 10:50:33 +02:00
artica da935b6569 Auto-updated build strings. 2023-09-27 01:00:22 +02:00
Rafael Ameijeiras 03700d2653 Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032

See merge request artica/pandorafms!6476
2023-09-26 15:15:27 +00:00
Rafael Ameijeiras a69550c733 Merge branch 'ent-12071-16277-columna-secondary-groups-en-la-vista-de-inventario-no-muestra-nada' into 'develop'
Fix inventory view agent secondary groups

See merge request artica/pandorafms!6456
2023-09-26 15:14:47 +00:00
artica fbeb616eb8 Auto-updated build strings. 2023-09-26 01:00:25 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
Jorge Rincon db7a5e121d Add the None option to the date filter to prioritize the period of the report items. 2023-09-25 17:10:43 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
miguel angel rasteu 550bd0e6ba #12073 Add tip 2023-09-25 15:39:48 +02:00
Rafael Ameijeiras 60c3bb456a Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop'
Ent 12099 cabecera de filtros descuadrada en informes vista html

See merge request artica/pandorafms!6480
2023-09-25 11:22:08 +00:00
Diego Muñoz-Reja 738428a816 Merge branch 'ent-12090-editar-intevalos-por-defecto' into 'develop'
Ent 12090 editar intevalos por defecto

See merge request artica/pandorafms!6467
2023-09-25 09:27:49 +00:00
miguel angel rasteu 4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
Diego Muñoz-Reja 5079cb9256 Merge branch 'ent-12044-consola-acustica-rota-en-version-open' into 'develop'
Ent 12044 consola acustica rota en version open

See merge request artica/pandorafms!6469
2023-09-25 08:23:34 +00:00
miguel angel rasteu 9a5a1f02bf #12099 Fix filter position 2023-09-25 09:55:55 +02:00
Rafael Ameijeiras b1c3eb7f3c Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop'
Ent 12100 graph analysis no puedo exportar a grafica combinada

See merge request artica/pandorafms!6483
2023-09-25 07:11:48 +00:00
artica 8c19a075c3 Auto-updated build strings. 2023-09-25 01:00:18 +02:00
artica fa2e94eea3 Auto-updated build strings. 2023-09-24 01:00:19 +02:00
artica 7b3b1f9ccc Auto-updated build strings. 2023-09-23 01:00:21 +02:00
miguel angel rasteu f2bda1e58d #12099 Fix filter position 2023-09-22 13:05:29 +02:00
daniel c6a04d5d8f fix show comment events ticket pandora_enterprise#12066 2023-09-22 12:56:01 +02:00
Rafael Ameijeiras 1ffebcf49c Merge branch 'ent-11990-error-al-configurar-un-servicio-existente' into 'develop'
Ent 11990 error al configurar un servicio existente

See merge request artica/pandorafms!6470
2023-09-22 06:59:42 +00:00
artica b706376fa7 Auto-updated build strings. 2023-09-22 01:00:25 +02:00
Daniel Maya d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
Rafael Ameijeiras 56cb2c3232 Merge branch 'ent-12060-quitar-subrayado-curvo-en-las-pestanas-de-eventos' into 'develop'
Ent 12060 quitar subrayado curvo en las pestanas de eventos

See merge request artica/pandorafms!6453
2023-09-21 15:45:50 +00:00
Rafael Ameijeiras fb45a73279 Merge branch 'ent-12027-tree-view-muestra-raro-los-elementos-en-modo-quiet' into 'develop'
Ent 12027 tree view muestra raro los elementos en modo quiet

See merge request artica/pandorafms!6473
2023-09-21 15:45:12 +00:00
Rafael Ameijeiras bcd12e8ffd Merge branch 'ent-12038-meter-enlace-a-setup-en-el-header' into 'develop'
Ent 12038 meter enlace a setup en el header

See merge request artica/pandorafms!6474
2023-09-21 15:42:43 +00:00
Rafael Ameijeiras d136b7a9e3 Merge branch 'ent-9857-complex-alert-processing' into 'develop'
Ent-9857-complex-alert-processing

Closes pandora_enterprise#9857

See merge request artica/pandorafms!6347
2023-09-21 15:41:24 +00:00
Rafael Ameijeiras 902317fa70 Merge branch 'ent-12097-operacion-view-summary-en-discovery-tasks-no-funciona' into 'develop'
Ent 12097 operacion view summary en discovery tasks no funciona

See merge request artica/pandorafms!6479
2023-09-21 15:40:57 +00:00
Diego Muñoz-Reja 576ee1bf37 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop'
Ent 11965 Security hardening: Console - Vistas estaticas

See merge request artica/pandorafms!6370
2023-09-21 14:57:06 +00:00
miguel angel rasteu e637866f72 #12100 Fix custom graph 2023-09-21 16:11:58 +02:00
miguel angel rasteu 80b0522c7c #12097 Fix view discovery 2023-09-21 14:21:54 +02:00
miguel angel rasteu d7f774bf57 #12099 Fix filter header 2023-09-21 13:12:11 +02:00
miguel angel rasteu 7d5f4f17c6 #12097 Fix view summary in discovery task 2023-09-21 13:06:39 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
Jonathan 192ec72b32 #12038 header link setup 2023-09-21 10:06:08 +02:00
Jonathan 23756e8495 #12038 header link setup 2023-09-21 08:46:09 +02:00
artica 963664c1d8 Auto-updated build strings. 2023-09-21 01:00:30 +02:00
alejandro.campos@artica.es dbd418d6dc remove trace 2023-09-20 16:01:23 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
Rafael Ameijeiras 2f95504038 Merge branch 'ent-12001-modulos-de-inventario-no-se-muestran' into 'develop'
Ent 12001 Módulos de inventario no se muestran

See merge request artica/pandorafms!6465
2023-09-20 13:49:07 +00:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
felix.suarez 976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Félix Suárez 2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Jonathan dc9b47a904 #12027 tree view quiet mode 2023-09-20 13:51:56 +02:00
Rafael Ameijeiras ff2cc62c4f Merge branch 'ent-11921-discovery-2-0-crear-paquetes-especificos-de-server-y-consola-el7-y-el8-con-los-binarios-del' into 'develop'
Add open discovery to packaging

See merge request artica/pandorafms!6448
2023-09-20 11:18:18 +00:00
Daniel Maya 05320f7ad4 #11990 Fixed enable_horizontal_tree 2023-09-20 12:42:01 +02:00
Daniel Cebrian 73d179e52f #12001 added autoselect module in inventory 2023-09-20 12:14:55 +02:00
Jonathan fcefe5a225 #12044 fix acoustic console open error 500 2023-09-20 12:07:19 +02:00
Jonathan aea61a6144 #12060 fix border radius sound events 2023-09-20 11:57:16 +02:00
Rafael Ameijeiras 06e23338cb Merge branch 'ent-12089-lineas-dobles-en-la-vista-de-modulos' into 'develop'
Ent 12089 lineas dobles en la vista de modulos

See merge request artica/pandorafms!6466
2023-09-20 09:00:41 +00:00
Rafael Ameijeiras 65b4bba0c6 Merge branch 'ent-11807-security-hardening-console-informes' into 'develop'
Ent 11807 Security hardening: Console - Informes

See merge request artica/pandorafms!6292
2023-09-20 07:59:02 +00:00
artica 92b8446110 Auto-updated build strings. 2023-09-20 01:00:27 +02:00
miguel angel rasteu 954a225279 #12090 Fix intervals 2023-09-19 17:47:12 +02:00
Daniel Cebrian cba3e39f6c Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-19 17:32:06 +02:00
Daniel Cebrian 32b7a103eb #12001 fixed list modules when select agent 2023-09-19 17:26:36 +02:00
miguel angel rasteu 6609571482 #12089 Add nowrap class to timestamp 2023-09-19 17:21:44 +02:00
Daniel Cebrian 940447d2b0 #12050 new icon security hardening widget 2023-09-19 16:43:55 +02:00
Daniel Cebrian 1465400fb6 #12001 fixed filter in inventary 2023-09-19 16:22:58 +02:00
Rafael Ameijeiras f5c4ce872b Merge branch 'ent-11729-plugin-proxmox-discovery-disco' into 'develop'
Added Proxmox discovery APP to MR and pandoradb_data

See merge request artica/pandorafms!6443
2023-09-19 10:16:53 +00:00
Rafael Ameijeiras 8b267c530f Merge branch 'ent-12006-filtro-order-by-agent-de-inventario-rompe-la-vista-si-se-especifica-modulo' into 'develop'
Ent 12006 Filtro "Order by agent" de inventario rompe la vista si se especifica módulo

See merge request artica/pandorafms!6459
2023-09-19 10:09:40 +00:00
Rafael Ameijeiras e5ea35abca Merge branch 'ent-12072-error-al-crear-item-sql-en-metaconsola-con-local-metaconsole' into 'develop'
fix error report sql pandora_enterprise#12072

See merge request artica/pandorafms!6458
2023-09-19 10:09:02 +00:00
Enrique Martin 7a725d0c16 Merge branch 'develop' into 'ent-11729-plugin-proxmox-discovery-disco'
Conflicts:
   pandora_console/extras/mr/66.sql
2023-09-19 08:42:38 +00:00
Daniel Cebrian 0a7152f3fa #12050 align text left in widget 2023-09-19 09:44:46 +02:00
Daniel Cebrian 592d7ab745 #11807 fixed empty field agent 2023-09-19 09:21:42 +02:00
artica 1bb1bb11b2 Auto-updated build strings. 2023-09-19 01:00:29 +02:00
Daniel Cebrian 6e794f74bb Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-18 16:54:16 +02:00
Daniel Cebrian b85d622d51 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-18 16:52:57 +02:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Daniel Cebrian 2d7baeb912 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-18 16:30:24 +02:00
Daniel Cebrian ed8f766c00 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-18 16:27:37 +02:00
Daniel Cebrian 5491feb845 #12050 control widget installed only in interprise 2023-09-18 16:09:23 +02:00
Daniel Cebrian 67ebf73bc0 #12050 widget security hardening 2023-09-18 15:57:09 +02:00
Rafael Ameijeiras 83732250da Merge branch 'ent-11363-automonitoring-alertserver' into 'develop'
Ent-11363-automonitoring-alertserver

Closes pandora_enterprise#11363

See merge request artica/pandorafms!6406
2023-09-18 13:20:37 +00:00
Rafael Ameijeiras ce38970c38 Merge branch 'ent-12007-16207-error-vmware-en-discovery-por-falta-de-atributo' into 'develop'
Changed version for VMware discovery plugin

See merge request artica/pandorafms!6439
2023-09-18 13:19:33 +00:00
Rafael Ameijeiras a75369aeda Merge branch 'ent-11839-error-en-direccion-url-por-correo-electronico-con-incorrect-config-value-y-error-en-causa-raiz' into 'develop'
Ent 11839 error en direccion url por correo electronico con incorrect config value y error en causa raiz

See merge request artica/pandorafms!6381
2023-09-18 13:18:36 +00:00
Daniel Cebrian 1e9e74ce92 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-18 12:15:17 +02:00
Daniel Cebrian adbbb688de #12006 fixed interface in inventary widget 2023-09-18 12:11:45 +02:00
daniel b167a4b4c5 fix error report sql pandora_enterprise#12072 2023-09-18 11:55:01 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
2023-09-18 07:55:18 +00:00
Daniel Cebrian ca928bd4a4 #11807 new input interval in report hardening 2023-09-18 09:41:53 +02:00
Rafael Ameijeiras ecba5065d4 Merge branch 'ent-11806-16007-icono-de-edicion-de-alertas-en-agente-no-tiene-el' into 'develop'
Ent 11806 16007 icono de edicion de alertas en agente no tiene el

See merge request artica/pandorafms!6449
2023-09-18 07:23:01 +00:00
Rafael Ameijeiras b568085841 Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop'
not show edition buttons of alert detail pandora_enterprise#12035

See merge request artica/pandorafms!6444
2023-09-18 07:22:13 +00:00
Pablo Aragon bed83f1406 11839-Add max in User->Block size pagination 2023-09-18 08:23:05 +02:00
artica 2c055a4488 Auto-updated build strings. 2023-09-18 01:00:20 +02:00
artica 4450f4d5fe Auto-updated build strings. 2023-09-17 01:00:20 +02:00
artica 495780b8a8 Auto-updated build strings. 2023-09-16 01:00:25 +02:00
Daniel Cebrian 25e0834db0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-15 14:57:18 +02:00
Daniel Cebrian f1c153231f #11807 added period in evolution 2023-09-15 14:55:49 +02:00
Jorge Rincon 08fe98a8ba fixed filter display permissions in modal 2023-09-15 13:57:14 +02:00
Calvo 9394446a1e Fix inventory view agent secondary groups 2023-09-15 13:46:29 +02:00
Daniel Cebrian 2844dfd4f0 #11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports 2023-09-15 13:34:07 +02:00
artica 95f9ddba01 Auto-updated build strings. 2023-09-15 01:00:29 +02:00
Daniel Cebrian 977a18b829 #11807 fixed pdf exports in hardening 2023-09-14 17:56:19 +02:00
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
Rafael Ameijeiras c05178ccf9 Merge branch 'ent-12033-vista-tactica-vista-de-servidores-no-muestra-modulos-de-red' into 'develop'
Fix counters tactical view pandora_enterprise#12033

See merge request artica/pandorafms!6441
2023-09-14 12:34:58 +00:00
Jonathan 5f35bbc1c0 #12060 fix line active 2023-09-14 13:01:54 +02:00
Daniel Cebrian c101389a26 #12050 new widget security hardening 2023-09-14 12:44:03 +02:00
Calvo d0c1fa7db3 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-14 12:24:25 +02:00
Calvo a2baea5710 Migration legacy apps to discovery 2.0 2023-09-14 12:24:12 +02:00
Enrique Martin c62a3aa2f4 Added execution permission for console disco binaries 2023-09-14 12:03:51 +02:00
alejandro.campos@artica.es f410f09745 change mr 2023-09-14 10:43:35 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
artica 018938cb8e Auto-updated build strings. 2023-09-14 01:00:27 +02:00
Daniel Cebrian 0f13b6d862 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-13 15:05:01 +02:00
Rafael Ameijeiras 046657e78a Merge branch 'ent-12028-la-vista-group-detail-no-esta-mostrando-los-agentes-que-tienen-el-grupo-mostrado-como-gru' into 'develop'
Ent 12028 La vista "group detail" no está mostrando los agentes que tienen el grupo mostrado como grupo secundario

See merge request artica/pandorafms!6446
2023-09-13 12:50:55 +00:00
Rafael Ameijeiras 69030a9e3b Merge branch 'ent-12010-header-de-los-welcome-tips-se-corta' into 'develop'
Ent 12010 Header de los Welcome Tips se corta

See merge request artica/pandorafms!6445
2023-09-13 12:46:07 +00:00
daniel e2cf8de7a9 fixed errors pandora_enterprise#12035 2023-09-13 14:15:07 +02:00
Daniel Cebrian 8ecb57a498 #11807 fixed bug in open 2023-09-13 13:53:53 +02:00
Daniel Cebrian db20db8244 #11965 fixed bug in opensource 2023-09-13 13:12:23 +02:00
Daniel Rodriguez d1fcbca557 Merge branch 'ent-10846-Vista-HA-en-Metaconsola' into 'develop'
implemented database ha view in metaconsole

See merge request artica/pandorafms!6275
2023-09-13 10:47:03 +00:00
Daniel Cebrian 8f146d1af7 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-13 09:52:09 +02:00
Pablo Aragon 959a2e9110 11806-Add alert icon in Manage agent 2023-09-13 08:14:11 +02:00
artica a46a43fd89 Auto-updated build strings. 2023-09-13 01:00:30 +02:00
Enrique Martin 8ae2631a56 Add open discovery to packaging 2023-09-12 16:46:05 +02:00
Daniel Cebrian 9619854ba2 #12028 added secondary groups in tactical view 2023-09-12 16:35:45 +02:00
miguel angel rasteu 91aee79ab2 #12037 Resolve conflicts 2023-09-12 15:07:00 +02:00
daniel 8e29973128 ITSM pandora_enterprise#11471 2023-09-12 13:10:23 +02:00
Daniel Cebrian 1a9b770a9e #12010 fixed header modal 2023-09-12 12:42:40 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
Daniel Cebrian 8d0213f841 #11807 fixed selected module in report list check 2023-09-12 12:13:01 +02:00
Enrique Martin 64effb2e91 Added Proxmox discovery APP to MR and pandoradb_data 2023-09-12 11:48:29 +02:00
Daniel Cebrian 1cd5d1b0fa #11965 new view hardening 2023-09-12 10:45:23 +02:00
Enrique Martin 6f5b20ac54 Changed version for VMware discovery plugin 2023-09-12 09:51:49 +02:00
Rafael Ameijeiras bab81b08e2 Merge branch 'ent-10676-14689-aumento-agentes-en-monitors-view' into 'develop'
Ent 10676 14689 aumento agentes en monitors view

See merge request artica/pandorafms!6426
2023-09-12 07:23:33 +00:00
artica 283bb1f571 Auto-updated build strings. 2023-09-12 01:00:27 +02:00
daniel 5093d54137 ITSM pandora_enterprise#11471 2023-09-11 18:14:32 +02:00
miguel angel rasteu fddf204a1b #10676 Fix module text size 2023-09-11 15:18:25 +02:00
Rafael Ameijeiras 0d0380f37d Merge branch 'ent-12017-icono-para-ver-informe-cambia' into 'develop'
Ent 12017 icono para ver informe cambia

See merge request artica/pandorafms!6431
2023-09-11 11:35:39 +00:00
Rafael Ameijeiras a1365ce6bf Merge branch 'ent-12002-bug-al-editar-modulos-por-operacion-masiva-e-intentar-deshabilitarlos' into 'develop'
Fix bulk operation only disabling/enabling modules

See merge request artica/pandorafms!6430
2023-09-11 11:34:55 +00:00
Rafael Ameijeiras 5aa2c5e0e8 Merge branch 'ent-12012-Busqueda-de-agentes-en-version-Community-no-funciona' into 'develop'
fix agent search in community versoin

See merge request artica/pandorafms!6419
2023-09-11 11:34:30 +00:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
miguel angel rasteu 95f84b975c #12017 Fix see details icon 2023-09-11 10:40:39 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
Rafael Ameijeiras 8a41aa7f7a Merge branch 'ent-11947-16141-notificacion-access-statistics-performance-permanece-en-la-consola-teniendo-los-tokens' into 'develop'
Ent 11947 16141 notificacion access statistics performance permanece en la consola teniendo los tokens

See merge request artica/pandorafms!6372
2023-09-11 07:17:46 +00:00
Rafael Ameijeiras 8206f39adb Merge branch 'ent-11983-nos-hemos-cargado-el-commit-del-boleto-10098' into 'develop'
Recovered php version error message

See merge request artica/pandorafms!6424
2023-09-11 07:17:19 +00:00
Rafael Ameijeiras 0c6aaa6723 Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop'
Ent 11993 user notifications esta roto

See merge request artica/pandorafms!6412
2023-09-11 07:15:38 +00:00
daniel fdaaf1a2e8 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-11 08:47:55 +02:00