daniel
ea97bb8f60
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-14 13:27:03 +01:00
daniel
f78c7495e5
fixed modal close click button execute twice function close pandora_enterprise#12447
2023-12-14 13:18:53 +01:00
Diego Muñoz-Reja
60a2557878
Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop'
...
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion
See merge request artica/pandorafms!6451
2023-12-14 11:19:25 +00:00
Matias Didier
352434d69a
Merge branch 'ent-12132-bug-en-welcome-tips-con-muchos-tips' into 'develop'
...
Ent 12132 bug en welcome tips con muchos tips
See merge request artica/pandorafms!6557
2023-12-14 11:03:37 +00:00
Calvo
036425ddda
Fix opensearch total documents automonitorization
2023-12-14 11:40:26 +01:00
daniel
3cb4b5cce4
Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/67.sql
pandora_console/operation/menu.php
2023-12-14 11:21:51 +01: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
daniel
27d76a0890
fix error cv item module graph periodicity mode pandora_enterprise#9640
2023-12-14 11:03:45 +01:00
Jonathan
065b096f14
#12366 user list 5 users bug styles
2023-12-14 10:03:58 +01:00
Rafael Ameijeiras
e71a104e74
Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop'
...
Draft: Ent 12566 Mejoras en visualización de eventos
See merge request artica/pandorafms!6735
2023-12-14 08:57:44 +00:00
Rafael Ameijeiras
d5b3bd1c02
Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop'
...
Ent 12483 varios bugs en la vista de campos personalizados
See merge request artica/pandorafms!6689
2023-12-14 08:42:02 +00:00
Rafael Ameijeiras
f3d190a8bb
Merge branch 'ent-8365-ncm-fase-3' into 'develop'
...
Ent 8365 ncm fase 3
See merge request artica/pandorafms!6612
2023-12-14 08:40:31 +00:00
Rafael Ameijeiras
dcdd3e139e
Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop'
...
Ent 12468 instrucciones se rompen en vista de eventos
See merge request artica/pandorafms!6711
2023-12-14 08:39:44 +00:00
Jonathan
6e150c1bc2
#12560 alert update manager
2023-12-14 08:59:13 +01:00
Jonathan
53b56b31af
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-14 08:38:52 +01:00
artica
dffdbff8b1
Auto-updated build strings.
2023-12-14 01:00:28 +01:00
Daniel Cebrian
fed0d92805
#12566 fixed colums module_custom_id and event_custom_id length_
2023-12-13 19:53:14 +01:00
felix.suarez
ea935d3a92
API allow create events with event_custom_id
2023-12-13 12:42:17 -06:00
Rafael Ameijeiras
c5687ee1fd
Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop'
...
fix error empty clusters pandora_enterprise#12511
See merge request artica/pandorafms!6719
2023-12-13 16:32:17 +00:00
Rafael Ameijeiras
f4fdacb791
Merge branch 'ent-12381-bugs-visuales-al-editar-modulo-en-politicas' into 'develop'
...
Ent 12381 bugs visuales al editar modulo en politicas
See merge request artica/pandorafms!6637
2023-12-13 14:40:32 +00:00
Jonathan
8a6efadc7c
#12398 fix url mcros to macros
2023-12-13 15:31:06 +01:00
Jonathan
a750e6010d
Merge branch 'develop' into ent-12381-bugs-visuales-al-editar-modulo-en-politicas
2023-12-13 14:46:36 +01:00
Matias Didier
5d9f50fb05
Merge branch 'ent-12270-paginacion-de-widgets-hace-que-me-quepan-en-pantalla' into 'develop'
...
Ent 12270 paginacion de widgets hace que me quepan en pantalla
See merge request artica/pandorafms!6586
2023-12-13 13:29:15 +00:00
Rafael Ameijeiras
e042c67d2a
Merge branch 'ent-11495-nuevo-tipo-de-informe-service-level-detailed' into 'develop'
...
Ent 11495 nuevo tipo de informe service level detailed
See merge request artica/pandorafms!6447
2023-12-13 12:20:17 +00:00
Rafael Ameijeiras
a5c5e07565
Merge branch 'ent-12065-faltan-opciones-al-abrir-consola-visual-en-la-vista-de-eventos' into 'develop'
...
Ent 12065 faltan opciones al abrir consola visual en la vista de eventos
See merge request artica/pandorafms!6454
2023-12-13 12:19:25 +00:00
Rafael Ameijeiras
645c2d886a
Merge branch 'ent-12390-item-heatmap-se-rompe-al-no-elegir-grupo' into 'develop'
...
Ent 12390 item heatmap se rompe al no elegir grupo
See merge request artica/pandorafms!6652
2023-12-13 12:17:10 +00:00
Rafael Ameijeiras
14a74ca5f2
Merge branch 'ent-12416-error-con-php82-y-encryption_passphrase' into 'develop'
...
Ent 12416 Error con php82 y encryption_passphrase
See merge request artica/pandorafms!6724
2023-12-13 12:12:00 +00:00
Rafael Ameijeiras
891c5a521c
Merge branch 'ent-12632-ack-timestamp-de-in-process-o-validacion-de-evento-no-se-muestra-en-el-detalle' into 'develop'
...
Ent 12632 ack timestamp de in process o validacion de evento no se muestra en el detalle
See merge request artica/pandorafms!6759
2023-12-13 12:07:53 +00:00
daniel
af99c10b19
fix events sound pandora_enterprise#12607
2023-12-13 13:03:58 +01:00
Jonathan
88784de3ef
#12143 fix datepicker dashboard widget hardening
2023-12-13 13:03:08 +01:00
Daniel Cebrian
6e246d5d29
#12509 fixed status agents disabled
2023-12-13 12:04:00 +01:00
Daniel Rodriguez
70d8b344b7
Merge branch 'ent-12176-mejorar-la-captura-de-errores-en-nuevo-discovery-cuando-termine-con-errores' into 'develop'
...
Ent 12176 Mejorar la captura de errores en nuevo Discovery cuando termine con errores
See merge request artica/pandorafms!6705
2023-12-13 10:32:58 +00: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
f4d2a40f13
Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
2023-12-13 10:58:57 +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
Daniel Cebrian
7b6c14974d
#12573 fixed number of cells in list dashboard
2023-12-13 10:34:46 +01:00
daniel
56f50bf4b0
Merge remote-tracking branch 'origin/develop' into ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto
2023-12-13 10:05:07 +01:00
miguel angel rasteu
a3feac4f2e
#12065 Resolve conflicts
2023-12-13 08:32:12 +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
Jonathan
475453ac3d
#12398 fix minor errors
2023-12-13 08:02:43 +01:00
artica
14f8deebca
Auto-updated build strings.
2023-12-13 01:00:28 +01:00
Jonathan
6e60d19193
#8365 ftp server ip
2023-12-12 15:46:42 +01:00
Daniel Cebrian
464ad467aa
#12631 created new token Ignore unknown for agent and modules
2023-12-12 15:30:10 +01:00
Matias Didier
aa9d65927b
Merge branch 'ent-12581-consola-visual-labels-con-negrita-pierden-el-tamano' into 'develop'
...
Ent 12581 Consola visual. Labels con negrita pierden el tamaño
See merge request artica/pandorafms!6731
2023-12-12 13:51:58 +00:00
Daniel Maya
9dbac217c1
#12633 Fixed Acknowledged 2
2023-12-12 14:07:18 +01:00
Daniel Maya
90c91f67fa
#12633 Fixed Acknowledged
2023-12-12 12:45:13 +01:00
Jonathan
c593161525
#12398 change urls wiki
2023-12-12 12:22:51 +01:00
Daniel Cebrian
276cf73e49
#12575 fixed order columns in dashboard
2023-12-12 10:23:47 +01:00
miguel angel rasteu
77fd03d58a
#11495 Fix agent name in module selection
2023-12-12 10:15:37 +01:00
miguel angel rasteu
fec7bf8b90
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-12 09:45:36 +01:00
Diego Muñoz-Reja
f5a455aa15
Merge branch 'ent-11750-15965-conflictos-en-la-insercion-de-datos-mediante-la-api' into 'develop'
...
Ent 11750 15965 conflictos en la insercion de datos mediante la api
See merge request artica/pandorafms!6389
2023-12-12 07:30:18 +00:00
artica
ffdf0d81b9
Auto-updated build strings.
2023-12-12 01:00:30 +01:00
alejandro.campos@artica.es
812e47603e
some changes in audit view
2023-12-11 18:05:58 +01:00
Daniel Cebrian
616a8d728b
#12416 fixed multiples encrypts
2023-12-11 17:56:48 +01:00
Daniel Cebrian
1a9bdf97d1
#12566 changes in view events
2023-12-11 17:01:40 +01:00
miguel angel rasteu
94256559f1
#11495 Fix agent name in metaconsole module selector
2023-12-11 16:46:19 +01:00
Rafael Ameijeiras
206bdc4acb
Merge branch 'ent-12168-GISS-Jerarquia-en-vista-de-arbol-de-servicios-no-se-muestra-bien-al-hacer-búsquedas-en-el-filtro-Nodo-y-Meta' into 'develop'
...
Ent 12168 giss jerarquia en vista de arbol de servicios no se muestra bien al hacer búsquedas en el filtro nodo y meta
See merge request artica/pandorafms!6547
2023-12-11 14:45:36 +00:00
Rafael Ameijeiras
ab370f1cf6
Merge branch 'ent-12096-arreglar-apostrofe-en-texto-let-s-do-it-del-mensaje-de-bienvenida' into 'develop'
...
Ent 12096 arreglar apostrofe en texto let s do it del mensaje de bienvenida
See merge request artica/pandorafms!6484
2023-12-11 14:45:06 +00:00
Rafael Ameijeiras
fa13fd5730
Merge branch 'ent-11936-cambiar-o-arreglar-nombres-de-apartados-de-menu-lateral-en-hover' into 'develop'
...
Ent 11936 cambiar o arreglar nombres de apartados de menu lateral en hover
See merge request artica/pandorafms!6442
2023-12-11 14:32:20 +00:00
Rafael Ameijeiras
7f75445d75
Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop'
...
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0
See merge request artica/pandorafms!6410
2023-12-11 14:30:51 +00:00
Rafael Ameijeiras
94211ac75d
Merge branch 'ent-11107-permitir-solamente-extension-mib-en-el-mib-uploader' into 'develop'
...
Fix upload file function filter by extension. Fix mib uploader only upload .mib file
See merge request artica/pandorafms!6601
2023-12-11 14:29:57 +00:00
Rafael Ameijeiras
43fd67b072
Merge branch 'ent-12058-incluir-version-de-mysql-en-about-y-diagnostic-info' into 'develop'
...
Ent 12058 incluir version de mysql en about y diagnostic info
See merge request artica/pandorafms!6481
2023-12-11 14:28:31 +00: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
Rafael Ameijeiras
048c2cbec6
Merge branch 'ent-12596-modificar-banner-version-en-consola-open' into 'develop'
...
Ent 12596 modificar banner version en consola open
See merge request artica/pandorafms!6752
2023-12-11 14:19:15 +00:00
Matias Didier
fe9dcb2c91
Merge branch 'ent-12530-reportes-SLA-rotos-al-mover-agente' into 'develop'
...
Ent 12530 reportes sla rotos al mover agente
See merge request artica/pandorafms!6725
2023-12-11 13:10:51 +00:00
miguel angel rasteu
3a00ba0fd6
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-11 12:41:37 +01:00
Jonathan
28dc5cada0
#12596 new dialog on baner open version
2023-12-11 12:21:33 +01:00
Enrique Martin
9f98710248
Set default agents to create
2023-12-11 12:15:53 +01:00
Enrique Martin
93293f41ef
Removed debug default agents to create value
2023-12-11 12:14:19 +01:00
Enrique Martin
c8e7e1e375
Added text to welcome wizard
2023-12-11 12:08:50 +01:00
Enrique Martin
00a0fa8eae
Fixed reports generation
2023-12-11 11:53:46 +01:00
daniel
fd212e7c20
fix error hide/show input sliced mode pandora_enterprise#9640
2023-12-11 11:24:45 +01: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
daniel
7258188491
remove agents bulk operation pandora_enterprise#12299
2023-12-11 11:01:53 +01:00
Enrique Martin
5a5674f3b4
Set default agents to create to 30
2023-12-11 10:33:03 +01:00
Jonathan
49fd9435dd
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-11 10:13:46 +01:00
Rafael Ameijeiras
071427e60b
Merge branch 'ent-12274-pandora-gotty-no-se-levanta-automaticamente-con-el-cron-en-ubuntu' into 'develop'
...
fix pgrep process in ubuntu
See merge request artica/pandorafms!6658
2023-12-11 08:54:30 +00:00
miguel angel rasteu
d034116dd3
#11495 Fix report
2023-12-11 09:26:57 +01:00
Rafael Ameijeiras
781a3656cc
Merge branch 'ent-11494-nuevo-widget-service-level-detail' into 'develop'
...
Ent 11494 nuevo widget service level detail
See merge request artica/pandorafms!6438
2023-12-11 08:21:13 +00:00
miguel angel rasteu
8e69326e3c
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-11 08:43:37 +01:00
artica
5351af2f7a
Auto-updated build strings.
2023-12-11 01:00:22 +01:00
artica
16f75809f1
Auto-updated build strings.
2023-12-10 01:00:20 +01:00
artica
ef339a1bbe
Auto-updated build strings.
2023-12-09 01:00:21 +01:00
artica
d83a64da9c
Auto-updated build strings.
2023-12-08 01:00:28 +01:00
Matias Didier
385989f185
Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop'
...
VC Public links pandora_enterprise#12329
See merge request artica/pandorafms!6633
2023-12-07 15:27:57 +00:00
Jorge Rincon
8d4e3e78a3
#12579 fixed icons as buttons in action on satellite server agents
2023-12-07 16:00:42 +01:00
Diego Muñoz-Reja
4d8aa8f697
Merge branch 'ent-11886-errata-minimun-en-informes' into 'develop'
...
Ent 11886 errata minimun en informes
See merge request artica/pandorafms!6386
2023-12-07 09:59:29 +00:00
Jonathan
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
Diego Muñoz-Reja
b1b3cced7d
Merge branch 'ent-11903-16107-borrar-listado-mapas-gis' into 'develop'
...
Ent 11903 16107 borrar listado mapas gis
See merge request artica/pandorafms!6393
2023-12-07 09:27:38 +00:00
Jorge Rincon
abfa08b6e0
#12577 fixed visual error of the dynamic threshold ff threshold and cron from module containers
2023-12-07 10:25:11 +01:00
artica
62901b6a70
Auto-updated build strings.
2023-12-07 01:00:21 +01:00
artica
0481af6b50
Auto-updated build strings.
2023-12-06 01:00:26 +01:00
daniel
98f22dac72
Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
2023-12-05 16:48:33 +01:00
daniel
5c6f11511c
fix error events sound modal pandora_enterprise#12607
2023-12-05 16:48:12 +01:00
Alejandro Campos
0bdc6978e6
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
...
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es
457f8e9448
some changes in discovery
2023-12-05 16:07:14 +01:00
Daniel Cebrian
75720df6fa
#12176 fixed empty news board
2023-12-05 13:23:37 +01:00
daniel
066cb857e9
fix error histogram pandora_enterprise#12209
2023-12-05 13:15:54 +01:00
miguel angel rasteu
21ea0f5196
#11494 Fix MTRS
2023-12-05 12:53:32 +01:00
daniel
10515e88df
Merge remote-tracking branch 'origin/develop' into ent-12209-module-histogram-widget-no-coge-bien-los-estados-del-modulo
2023-12-05 12:37:17 +01:00
alejandro.campos@artica.es
cfc1992d26
Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo
2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es
9622b61557
Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo
2023-12-05 12:20:40 +01:00
Enrique Martin
2d1b2bf6d2
Added new dashboard widgets
2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es
e7f18709b7
optimization
2023-12-05 12:07:23 +01:00
daniel
34784752b7
fix error js load modal filter sound events pandora_enterprise#12607
2023-12-05 11:47:37 +01:00
alejandro.campos@artica.es
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +01:00
miguel angel rasteu
6455314f0c
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
2023-12-05 11:16:42 +01:00
daniel
ee3df634d6
fix error histogram and events history graph pandora_enterprise#12209
2023-12-05 10:35:02 +01:00
daniel
1d36d8a436
fix error 500 and warnings pandora_enterprise#12605
2023-12-05 09:14:02 +01:00
alejandro.campos@artica.es
c9c3426b16
minor change
2023-12-05 08:30:00 +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
artica
cdb3308e7a
Auto-updated build strings.
2023-12-05 01:00:24 +01:00
Enrique Martin
e833499dc3
Improvements, fixes and new demo elements
2023-12-04 16:58:08 +01:00
Daniel Cebrian
ea474ecd89
#12566 changes in events table
2023-12-04 15:05:01 +01:00
Daniel Rodriguez
a7abf4add7
Merge branch 'ent-12382-16531-permitir-cambiar-la-url-del-pdf-para-que-el-chromium-pueda-acceder-a-ella' into 'develop'
...
fix chart_generator pdf pandora_enterprise#12382
See merge request artica/pandorafms!6679
2023-12-04 13:38:18 +00:00
alejandro.campos@artica.es
4a64f023fe
Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo
2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es
75ddb3b934
minor changes in demo data functionality
2023-12-04 11:37:12 +01:00
Rafael Ameijeiras
a7ca102c5e
Merge branch 'ent-12078-grafica-del-log-viewer-con-fecha-erronea-y-caracteres-extranos' into 'develop'
...
Ent 12078 grafica del log viewer con fecha erronea y caracteres extranos
See merge request artica/pandorafms!6472
2023-12-04 08:19:43 +00:00
Rafael Ameijeiras
38672764a3
Merge branch 'ent-12341-agent-basic-options' into 'develop'
...
Ent 12341 agent basic options
See merge request artica/pandorafms!6681
2023-12-04 08:12:23 +00:00
Rafael Ameijeiras
7a238c34d6
Merge branch 'ent-12533-16681-error-al-aplicar-filtro-de-evento-personalizado-en-widget-list-of-latest-events' into 'develop'
...
Ent 12533 16681 error al aplicar filtro de evento personalizado en widget list of latest events
See merge request artica/pandorafms!6716
2023-12-04 08:11:49 +00:00
Rafael Ameijeiras
5e588b1ef1
Merge branch 'ent-12558-error-SQL-al-copiar-módulo-web-de-tipo-check-server-status-code' into 'develop'
...
Ent 12558 error sql al copiar módulo web de tipo check server status code
See merge request artica/pandorafms!6717
2023-12-04 08:11:23 +00:00
Rafael Ameijeiras
fdb58daf2d
Merge branch 'ent-12247-vistas-tacticas-de-seguridad-fase-2-vulnerabilidades-y-hardening' into 'develop'
...
Ent 12247 Vistas tácticas de seguridad fase 2 (vulnerabilidades y hardening)
See merge request artica/pandorafms!6707
2023-12-04 08:11:03 +00:00
artica
3eac0f9661
Auto-updated build strings.
2023-12-04 01:00:21 +01:00
Enrique Martin
55aee67df3
Added GIS maps creation
2023-12-03 23:23:57 +01:00
Enrique Martin
b14c77862e
Added new items to visual consoles
2023-12-03 21:43:00 +01:00
Enrique Martin
14fc8ef2b1
Added new items to visual consoles and fixed unknown modules on creation
2023-12-03 21:30:17 +01:00
artica
a2ea6f33f3
Auto-updated build strings.
2023-12-03 01:00:20 +01:00
artica
69229987f8
Auto-updated build strings.
2023-12-02 01:00:24 +01:00
Daniel Cebrian
5609bc2313
#12581 fixed strong size in visual console
2023-12-01 13:45:17 +01:00
miguel angel rasteu
3c99a2e49a
#11494 Fix Av. bug
2023-12-01 13:29:51 +01:00
Jorge Rincon
5191739658
#12542 fixed local component module group
2023-12-01 12:05:42 +01:00
Jonathan
1fb98d34ae
#12296 fix conflict merge develop
2023-12-01 11:59:03 +01:00
Jonathan
e2eaf6e01e
#12381 fix conflict merge develop
2023-12-01 11:22:15 +01:00
Rafael Ameijeiras
aa9aa40ebd
Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop'
...
Ent 12213 cambiar update manager por warp update
See merge request artica/pandorafms!6546
2023-12-01 10:07:07 +00:00
Rafael Ameijeiras
e52c596c82
Merge branch 'ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos' into 'develop'
...
fix error move agents to metaconsole pandora_enterprise#12086
See merge request artica/pandorafms!6661
2023-12-01 10:06:51 +00:00
miguel angel rasteu
41b92cc55f
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
2023-12-01 10:34:43 +01:00
miguel angel rasteu
b89f182e19
#12213 Resolve conflicts
2023-12-01 10:31:50 +01:00
daniel
b10a9e8274
Merge remote-tracking branch 'origin/develop' into ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos
...
Conflicts:
pandora_console/include/api.php
2023-12-01 10:31:17 +01:00
miguel angel rasteu
f847de7437
Merge branch 'develop' into ent-12052-filtro-de-vista-alert-details-no-muestra-las-alertas-de-los-agentes-que-tienen-grupo
2023-12-01 10:27:23 +01:00
Rafael Ameijeiras
d8063fd008
Merge branch 'ent-11652-en-detalles-de-alertas-el-contenido-no-se-adapta-al-espacio-adicional-disponible-al-colapsar' into 'develop'
...
Ent 11652 en detalles de alertas el contenido no se adapta al espacio adicional disponible al colapsar
See merge request artica/pandorafms!6397
2023-12-01 09:23:23 +00:00
Rafael Ameijeiras
c91d76706a
Merge branch 'ent-12175-fallo-visual-vista-tactica-eventos-recuperados' into 'develop'
...
Ent 12175 fallo visual vista tactica eventos recuperados
See merge request artica/pandorafms!6617
2023-12-01 09:22:56 +00:00
miguel angel rasteu
5ee6eb7306
#12052 Resolve conflicts
2023-12-01 10:19:39 +01:00
Daniel Maya
87f4a6e15f
#12384 Fixed acl
2023-12-01 10:08:25 +01:00
miguel angel rasteu
ec8d16e49b
#11652 Resolve conflicts
2023-12-01 10:07:41 +01:00
miguel angel rasteu
fb2e433b5c
#12175 Resolve conflicts
2023-12-01 10:00:51 +01:00
alejandro.campos@artica.es
cb60581bcf
Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo
2023-12-01 09:49:37 +01:00
alejandro.campos@artica.es
d6e107ea95
performance improvement
2023-12-01 09:48:45 +01:00
Daniel Rodriguez
39c6420d2c
Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop'
...
Ent 11763 15982 regex en busqueda de eventos
See merge request artica/pandorafms!6512
2023-12-01 08:44:46 +00:00
artica
3b6eac4284
Auto-updated build strings.
2023-12-01 01:00:28 +01:00
Enrique Martin
3807baa8ef
Added GIS random data to agents
2023-11-30 17:41:01 +01:00
Rafael Ameijeiras
b0b05a833d
Merge branch 'ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894' into 'develop'
...
Ent 12495 volver al comportamiento anterior en temas de permisos politicas 10894
See merge request artica/pandorafms!6700
2023-11-30 15:11:38 +00:00
Jonathan
f780d0bd2a
#12533 enable event list no group (Default all)
2023-11-30 15:58:39 +01:00
Jorge Rincon
741c8d40b3
#12530 Validation is added to the SLA report, the data of the SLA report item is not painted if the agent is not informed
2023-11-30 15:24:34 +01:00
Matias Didier
874e60bf55
Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop'
...
Ent 12248 mover token de configuracion s flow a la seccion de netflow
See merge request artica/pandorafms!6621
2023-11-30 13:05:46 +00:00
Diego Muñoz-Reja
c4e5a3bebd
Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop'
...
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso
See merge request artica/pandorafms!6501
2023-11-30 12:48:00 +00:00
Daniel Maya
e4b369c769
Merge branch 'develop' into ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894
2023-11-30 13:30:29 +01:00
Daniel Maya
6154ce725b
#12501 Fixed password field
2023-11-30 13:18:44 +01:00
Daniel Cebrian
01e1ecefac
#12247 fixed name graphs
2023-11-30 13:06:05 +01:00
Matias Didier
8cfb0353dd
Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop'
...
fix sound alerts severity filter pandora_enterprise#12378
See merge request artica/pandorafms!6663
2023-11-30 11:41:30 +00:00
Jonathan
c41b360a6e
#8365 merge conflict
2023-11-30 12:04:28 +01:00
Rafael Ameijeiras
c60c75475b
Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
...
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro
See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00
Rafael Ameijeiras
0957a87dcb
Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop'
...
Ent 11705 15916 campo editable en vista de eventos
See merge request artica/pandorafms!6486
2023-11-30 09:18:28 +00:00
daniel
817811ffac
fix error update manager pandora_enterprise#12447
2023-11-30 10:13:18 +01:00
Rafael Ameijeiras
98d414f262
Merge branch 'ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards' into 'develop'
...
Ent 10983 Selector de rango de fechas para múltiples elementos a la vez en dashboards
See merge request artica/pandorafms!6413
2023-11-30 08:58:15 +00:00
Jonathan
1fc2c432e5
Merge branch 'develop' into ent-12341-agent-basic-options
2023-11-30 09:14:35 +01:00
Enrique Martin
76327c6d73
Fixed demo graphs generation
2023-11-30 08:54:21 +01:00
Jonathan
b99c9240de
#8365 NCM Merge conflict
2023-11-30 08:32:15 +01:00
Jonathan
75d57337af
#11705 Fix merge conflict
2023-11-30 08:10:32 +01:00
Jonathan
e8272c0006
#11763 Fix merge conflict
2023-11-30 07:57:25 +01:00
artica
9d1e4b47ab
Auto-updated build strings.
2023-11-30 01:00:25 +01:00
Daniel Rodriguez
7f4a928f35
Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop'
...
Hide test button and setup in ITSM pandora_enterprise#12243
See merge request artica/pandorafms!6629
2023-11-29 17:52:26 +00:00
alejandro.campos@artica.es
dc2ac2a1b3
implement load demo data
2023-11-29 18:13:56 +01:00
alejandro.campos@artica.es
ca17eef68a
implement load demo data
2023-11-29 18:09:32 +01:00
alejandro.campos@artica.es
a290203847
implement demo data load
2023-11-29 16:57:38 +01:00
Jonathan
7a5201db4f
#8365 NCM V3 Minor fix
2023-11-29 16:31:06 +01:00
Daniel Cebrian
f1a8c4b31d
#12541 change message export graph
2023-11-29 16:12:12 +01:00
daniel
db89c72be5
fix error empty clusters pandora_enterprise#12511
2023-11-29 16:00:46 +01:00
Daniel Cebrian
c0218ad75c
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
2023-11-29 15:45:07 +01:00
Daniel Cebrian
b6722214de
#12541 changes in graph analytics
2023-11-29 15:43:38 +01:00
Diego Muñoz-Reja
eebab43e36
Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop'
...
Ent 11907 incluir distro y version en about y diagnostic info
See merge request artica/pandorafms!6420
2023-11-29 14:34:05 +00:00
Daniel Maya
0d285802b1
#12520 Fixed form
2023-11-29 15:32:46 +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
Rafael Ameijeiras
33ca5ab4ab
Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
...
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer
See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
Rafael Ameijeiras
2e0d732eb9
Merge branch 'ent-12498-widget-top-n-of-agent-modules-no-muestra-resultados-de-todos-los-agentes' into 'develop'
...
Ent 12498 Widget TOP N of Agent Modules no muestra resultados de TODOS los agentes
See merge request artica/pandorafms!6695
2023-11-29 14:22:48 +00:00
Jonathan
f50dade117
#12533 send events groupid widget
2023-11-29 15:08:22 +01:00
Jorge Rincon
e5ccd88f61
#12558 fixed SQL error when copying web module server status in debug_content field
2023-11-29 15:03:08 +01:00
alejandro.campos@artica.es
6f96087d90
implement demo data load
2023-11-29 11:30:48 +01:00
Jonathan
f86a3e60e8
#11763 save filter regex on bbdd
2023-11-29 11:14:40 +01:00
Daniel Cebrian
28820f4471
#12543 fixed pagination metaconsole
2023-11-29 11:04:48 +01:00
Matias Didier
e7ad23c477
Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop'
...
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico
See merge request artica/pandorafms!6489
2023-11-29 09:30:08 +00:00
Daniel Maya
892048554e
#12468 Fixed instructions
2023-11-29 10:27:55 +01:00
miguel angel rasteu
63945df5fd
#11495 Add tip and fix MTRS bug
2023-11-29 09:44:25 +01:00
miguel angel rasteu
64b612faea
#11494 Add tip and fix MTRS bug
2023-11-29 09:40:34 +01:00
alejandro.campos@artica.es
7240bbf934
implement demo data load
2023-11-29 09:00:45 +01:00
miguel angel rasteu
d096f3f9ea
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
2023-11-29 08:44:08 +01:00
artica
8378d7ef91
Auto-updated build strings.
2023-11-29 01:00:30 +01:00
Daniel Cebrian
4d1df2dcc5
#12247 refactored vulnerabilities and hardening
2023-11-28 16:59:04 +01:00
Matias Didier
447e788ab3
Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
...
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado
See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
Jonathan
837f1ff73c
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 13:04:13 +01:00
Rafael Ameijeiras
8b6a4733cf
Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop'
...
Ent 12253 Informe de vulnerabilidades
See merge request artica/pandorafms!6686
2023-11-28 11:14:48 +00:00
Matias Didier
8425e70740
Merge branch 'ent-12387-bug-edicion-item-agent-module-view' into 'develop'
...
Ent 12387 bug edicion item agent module view
See merge request artica/pandorafms!6622
2023-11-28 09:29:14 +00:00
Jonathan
30fd521cb7
Merge branch 'develop' into ent-12341-agent-basic-options
2023-11-28 09:32:59 +01:00
Matias Didier
44aff84d9e
Merge branch 'ent-11699-filtro-paradas-planificadas-con-fondo-blanco-en-black-theme-en-v772lts' into 'develop'
...
Ent 11699 filtro paradas planificadas con fondo blanco en black theme en v772lts
See merge request artica/pandorafms!6253
2023-11-28 08:22:29 +00:00
Jonathan
6e71cb8b7a
Merge branch 'develop' into ent-12387-bug-edicion-item-agent-module-view
2023-11-28 09:03:49 +01:00
daniel
f9e7f19771
Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
2023-11-28 08:43:45 +01:00
daniel
730cfb30ff
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
...
Conflicts:
pandora_console/include/styles/pandora.css
2023-11-28 08:40:07 +01:00
Jonathan
9819c3a5ff
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-28 08:30:23 +01:00
daniel
f6f0f15731
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
Jonathan
2dec31485a
Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer
2023-11-28 08:19:53 +01:00
daniel
3f3e8e42bc
move extension translate_string and file_repo pandora_enterprise#12333
2023-11-28 08:13:00 +01:00
Matias Didier
3b2c5237d1
Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'
...
Ent 12036 error en el nombre de la copia de un dashboard cualquiera
See merge request artica/pandorafms!6457
2023-11-28 07:09:11 +00:00
Matias Didier
b47b076cf1
Merge branch 'ent-1205-projection-graph-se-inventa-la-grafica-a-veces' into 'develop'
...
Ent 1205 projection graph se inventa la grafica a veces
See merge request artica/pandorafms!6435
2023-11-28 07:08:36 +00:00
Matias Didier
64cb2ad912
Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop'
...
Ent 11911 welcome dialog no detecta bien el correo configurado
See merge request artica/pandorafms!6440
2023-11-28 07:07:26 +00:00
Jonathan
def169abb8
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 07:58:50 +01:00
artica
8bb4758439
Auto-updated build strings.
2023-11-28 01:00:28 +01:00
Daniel Rodriguez
c7fcf7c168
Merge branch 'ent-11815-Modificar-creacion-de-modulos-predictivos-en-politicas-e-individualmente' into 'develop'
...
changed behavior of prediction modules creation
See merge request artica/pandorafms!6540
2023-11-27 16:01:57 +00:00
Jorge Rincon
34f9e0df49
Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico
2023-11-27 15:52:41 +01:00
Rafael Ameijeiras
964321d1bd
Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
...
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas
See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
Rafael Ameijeiras
728b9d7e7f
Merge branch 'ent-12157-sistema-de-notificaciones-muestra-mensaje-sin-texto-alguno' into 'develop'
...
Ent 12157 sistema de notificaciones muestra mensaje sin texto alguno
See merge request artica/pandorafms!6561
2023-11-27 14:48:49 +00:00
Rafael Ameijeiras
e3153166c1
Merge branch 'ent-11856-view-events-ubicacion-erronea-para-el-tip-del-token-search-in-secondary-groups' into 'develop'
...
Ent 11856 view events ubicacion erronea para el tip del token search in secondary groups
See merge request artica/pandorafms!6388
2023-11-27 14:48:24 +00:00
Rafael Ameijeiras
67700a1ea2
Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop'
...
Ent 12083 open inventory widget no carga
See merge request artica/pandorafms!6506
2023-11-27 14:46:47 +00:00
Rafael Ameijeiras
6e46875721
Merge branch 'ent-12208-desplegable-styles-de-widget-panel-with-a-message' into 'develop'
...
Ent 12208 desplegable styles de widget panel with a message
See merge request artica/pandorafms!6549
2023-11-27 14:39:38 +00:00
Rafael Ameijeiras
8e68198ab5
Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop'
...
Ent 11679 15855 nombres de modulos no tienen link a su edicion
See merge request artica/pandorafms!6422
2023-11-27 14:39:14 +00:00
Rafael Ameijeiras
25152e27f8
Merge branch 'ent-12082-error-al-copiar-widget-de-inventario' into 'develop'
...
Ent 12082 error al copiar widget de inventario
See merge request artica/pandorafms!6503
2023-11-27 14:38:33 +00:00
Rafael Ameijeiras
2fa8ed3c9e
Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop'
...
Ent 12219 error al eliminar perfiles en edicion de usuario
See merge request artica/pandorafms!6555
2023-11-27 14:38:14 +00:00
Rafael Ameijeiras
4406828cc2
Merge branch 'ent-12362-no-se-pueden-anadir-alertas-a-modulos-desde-la-vista-agents-alerts-view' into 'develop'
...
Fix add alerts pandora_enterprise#12362
See merge request artica/pandorafms!6625
2023-11-27 14:37:09 +00:00
Rafael Ameijeiras
57124c4f26
Merge branch 'ent-12363-agent-module-view-las-columnas-se-muestran-mal-al-exportar-a-csv' into 'develop'
...
Fix csv agent-module pandora_enterprise#12363
See merge request artica/pandorafms!6623
2023-11-27 14:36:53 +00:00
Daniel Cebrian
09708255aa
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
2023-11-27 13:34:33 +01:00
Daniel Cebrian
27d78ef049
Merge branch 'develop' into ent-12253-informe-de-vulnerabilidades
2023-11-27 13:29:05 +01:00
Daniel Cebrian
7cd163b01e
#12253 new reports
2023-11-27 13:25:52 +01:00
Matias Didier
9919de1d66
Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop'
...
Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para
See merge request artica/pandorafms!6392
2023-11-27 12:24:45 +00:00
Matias Didier
d544ef4ac5
Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
...
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola
See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
Rafael Ameijeiras
b15fc06870
Merge branch 'ent-11039-giss-snmp-browser-en-entornos-con-meta-no-funciona' into 'develop'
...
Ent 11039 [GISS] SNMP Browser en entornos con META no funciona.
See merge request artica/pandorafms!6592
2023-11-27 12:06:52 +00:00
miguel angel rasteu
e967b5820a
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
2023-11-27 13:06:51 +01:00
Rafael Ameijeiras
95cf2a2654
Merge branch 'ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar' into 'develop'
...
Ent 12268 dashboard widget de eventos no se puede clickar
See merge request artica/pandorafms!6620
2023-11-27 12:05:52 +00:00
miguel angel rasteu
cac31cc482
#12137 Resolve conflicts
2023-11-27 13:05:43 +01:00
Rafael Ameijeiras
a0e6710344
Merge branch 'ent-9761-eliminar-por-completo-a-logstash-de-la-consola-web' into 'develop'
...
Ent 9761 eliminar por completo a logstash de la consola web
See merge request artica/pandorafms!6570
2023-11-27 12:03:50 +00:00
Rafael Ameijeiras
f03213c748
Merge branch 'ent-12499-16645-columna-label-se-genera-mal-en-csv-en-vista-de-grafica-de-modulo' into 'develop'
...
Ent 12499 16645 columna label se genera mal en csv en vista de grafica de modulo
See merge request artica/pandorafms!6702
2023-11-27 12:02:33 +00:00
Rafael Ameijeiras
8865f0394e
Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop'
...
Ent 12218 bug del boton show hide password de usuarios
See merge request artica/pandorafms!6553
2023-11-27 12:00:28 +00:00
Rafael Ameijeiras
c41a2d0f19
Merge branch 'ent-11633-cambiar-ubicacion-del-boton-create-modules-en-wizards' into 'develop'
...
Ent 11633 cambiar ubicacion del boton create modules en wizards
See merge request artica/pandorafms!6436
2023-11-27 11:59:26 +00:00
Rafael Ameijeiras
c3af86414f
Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
...
Ent 11650 aviso emergente no acorde con la nueva interfaz
See merge request artica/pandorafms!6395
2023-11-27 11:56:57 +00:00
Rafael Ameijeiras
081e0c5482
Merge branch 'ent-12271-ventana-informativa-de-configuracion-de-widget-esta-pocha' into 'develop'
...
Ent 12271 ventana informativa de configuracion de widget esta pocha
See merge request artica/pandorafms!6583
2023-11-27 11:56:32 +00:00
Rafael Ameijeiras
cf65c66c38
Merge branch 'ent-12177-en-gestion-de-versiones-obsolescencia-planeada-al-subir-una-supuesta-imagen-guarda-y-se-va-al' into 'develop'
...
Ent 12177 en gestion de versiones obsolescencia planeada al subir una supuesta imagen guarda y se va al
See merge request artica/pandorafms!6560
2023-11-27 11:55:29 +00:00
Rafael Ameijeiras
7b4423148e
Merge branch 'ent-11655-fe-de-erratas-en-idioma-ingles-por-consola-web' into 'develop'
...
Ent 11655 fe de erratas en idioma ingles por consola web
See merge request artica/pandorafms!6416
2023-11-27 11:53:17 +00:00
Rafael Ameijeiras
538a3448e8
Merge branch 'ent-12400-errores-de-formato-en-la-seleccion-de-fechas-de-log-viewer' into 'develop'
...
Ent 12400 errores de formato en la seleccion de fechas de log viewer
See merge request artica/pandorafms!6653
2023-11-27 11:41:02 +00:00
Rafael Ameijeiras
d6e613ca8b
Merge branch 'ent-11791-any-user-can-change-any-other-user-s-notification-settings' into 'develop'
...
Ent 11791 any user can change any other user s notification settings
See merge request artica/pandorafms!6400
2023-11-27 11:19:14 +00:00
miguel angel rasteu
f46e17f84d
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
2023-11-27 11:51:35 +01:00
miguel angel rasteu
b0125d943e
#12138 Resolve conflict
2023-11-27 11:51:00 +01:00
Rafael Ameijeiras
47a0c8e956
Merge branch 'ent-11442-consejos-de-bienvenida-tienen-controles-confusos' into 'develop'
...
Ent 11442 consejos de bienvenida tienen controles confusos
See merge request artica/pandorafms!6414
2023-11-27 10:47:18 +00:00
miguel angel rasteu
a4cd6d7fe1
#12138 Resolve conflict
2023-11-27 11:43:24 +01:00