tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
37,120 Commits 34 Branches 30 Tags
Commit Graph

37120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rafael Ameijeiras
7c3cdd1d11 Merge branch 'ent-11510-vista-de-inventario-hace-el-filtrado-antes-de-escoger-todos-los-campos' into 'develop' 
Ent 11510 vista de inventario hace el filtrado antes de escoger todos los campos

See merge request artica/pandorafms!6402
 2023-12-13 16:33:34 +00: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
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
adcf2df86d Merge branch 'ent-12345-16503-boton-deshabilitar-modulo-en-vista-modulos-no-inserta-token-module_disabled-1' into 'develop' 
Ent 12345 16503 boton deshabilitar modulo en vista modulos no inserta token module disabled 1

See merge request artica/pandorafms!6638
 2023-12-13 12:18:52 +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
710edde3e0 Merge branch 'ent-9753-derivado-del-trabajo-q-a-766-reparar-la-administracion-de-module-groups-en-metaconsola' into 'develop' 
Ent 9753 derivado del trabajo q a 766 reparar la administracion de module groups en metaconsola

See merge request artica/pandorafms!6703
 2023-12-13 12:08:45 +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
miguel angel rasteu
e80e7d6996 #11510 Resolve conflicts 2023-12-13 12:08:08 +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
7df7fdff7d fix msg error agent cluster pandora_enterprise#12511 2023-12-13 10:32:29 +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
Diego Muñoz-Reja
d6d53a3cd7 Merge branch 'ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes' into 'develop' 
Ent 12296 mejorar aspecto filtros de busqueda en la vista principal de agentes

See merge request artica/pandorafms!6665
 2023-12-13 08:41:34 +00:00
Diego Muñoz-Reja
89ec81e151 Merge branch 'ent-11971-16145-proteccion-en-cascada-de-modulos-no-funciona-cuando-hay-ff' into 'develop' 
ent-11971-[#16145] Protección en cascada de módulos no funciona cuando hay FF

See merge request artica/pandorafms!6645
 2023-12-13 08:40:35 +00: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
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
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
Enrique Martin
a2f60a1d22 Updated MR changes 2023-12-12 12:12:24 +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
Daniel Cebrian
616a8d728b #12416 fixed multiples encrypts 2023-12-11 17:56:48 +01:00
miguel angel rasteu
94256559f1 #11495 Fix agent name in metaconsole module selector 2023-12-11 16:46:19 +01:00
Diego Muñoz-Reja
9e8ba22f15 Merge branch 'ent-11829-16031-agente-proxy-no-levanta-con-usuario-root' into 'develop' 
Ent-11829-16031-agente-proxy-no-levanta-con-usuario-root

See merge request artica/pandorafms!6569
 2023-12-11 15:27:11 +00:00
Rafael Ameijeiras
a2436cf60e Merge branch 'ent-12620-elementos-de-lista-negra-de-deteccion-de-cambios-en-inventario-en-el-setup-no-funciona' into 'develop' 
Ent 12620 elementos de lista negra de deteccion de cambios en inventario en el setup no funciona

See merge request artica/pandorafms!6745
 2023-12-11 14:46:27 +00: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
8b0d96bab7 Merge branch 'ent-12606-no-deja-editar-tiempo-en-reportes-sla' into 'develop' 
Ent 12606 no deja editar tiempo en reportes sla

See merge request artica/pandorafms!6744
 2023-12-11 14:23:53 +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
Matias Didier
962111936e Merge branch 'ent-12150-errores-en-los-cambios-para-los-logs-de-consola-y-directorios' into 'develop' 
Ent 12150 errores en los cambios para los logs de consola y directorios

See merge request artica/pandorafms!6518
 2023-12-11 11:13:35 +00:00