Rafael Ameijeiras
|
d84f69d922
|
Merge branch 'ent-11651-menu-lateral-se-despista-al-solicitar-detalle-de-alertas' into 'develop'
Ent 11651 menu lateral se despista al solicitar detalle de alertas
See merge request artica/pandorafms!6268
|
2023-08-07 07:28:55 +00:00 |
Jonathan
|
49f2dc35f8
|
#fix agent manager
|
2023-08-04 12:23:09 +02:00 |
|
Jonathan
|
47155513cc
|
#11710 fix error redirect url and pagination
|
2023-08-04 10:17:59 +02:00 |
|
Jonathan
|
10dd156b16
|
#11710 redirect meta message
|
2023-08-04 09:29:47 +02:00 |
|
Jonathan
|
9dabecffce
|
Merge branch 'develop' into ent-11710-fallo-en-la-paginacion-de-el-apartado-de-alert-commands-en-nodos-con-metaconsola
|
2023-08-04 09:27:24 +02:00 |
|
Rafael Ameijeiras
|
019efcb124
|
Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop'
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro
See merge request artica/pandorafms!6182
|
2023-08-04 06:45:42 +00:00 |
|
Rafael Ameijeiras
|
2cfa209147
|
Merge branch 'ent-10177-consola-web-no-muestra-cual-servidor-pfms-se-esta-editando' into 'develop'
Ent 10177 consola web no muestra cual servidor pfms se esta editando
See merge request artica/pandorafms!6304
|
2023-08-04 06:43:07 +00:00 |
|
Jonathan
|
6c4143db10
|
#11710 change message "go to metaconsole"
|
2023-08-04 08:40:46 +02:00 |
|
Rafael Ameijeiras
|
b2821c0db3
|
Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop'
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola
See merge request artica/pandorafms!6249
|
2023-08-04 06:34:35 +00:00 |
|
Rafael Ameijeiras
|
0b680568b5
|
Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop'
Ent 11739 compatibilidad php 8 2 second
See merge request artica/pandorafms!6300
|
2023-08-04 06:32:37 +00:00 |
miguel angel rasteu
|
1009404bfd
|
Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro
|
2023-08-03 13:42:49 +02:00 |
Daniel Maya
|
ddcfa02e6f
|
#11739 Fixed date_format 2
|
2023-08-03 12:51:50 +02:00 |
|
miguel angel rasteu
|
135c6835bd
|
#11713 fix title buttons
|
2023-08-03 12:51:09 +02:00 |
|
miguel angel rasteu
|
1dc24cdfb4
|
#11668 Fix black theme
|
2023-08-03 12:22:20 +02:00 |
|
Rafael Ameijeiras
|
8f04fbec4d
|
Merge branch 'ent-11645-mensaje-de-error-en-sla-items-erroneo' into 'develop'
Ent 11645 mensaje de error en sla items erroneo
See merge request artica/pandorafms!6179
|
2023-08-03 07:04:39 +00:00 |
|
Rafael Ameijeiras
|
fec85ce8e7
|
Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop'
Ent 11749 15964 conteo de agentes no aparece en v772
See merge request artica/pandorafms!6266
|
2023-08-03 07:04:11 +00:00 |
|
miguel angel rasteu
|
ef07bea496
|
#10177 Fix underscore
|
2023-08-03 07:59:13 +02:00 |
|
miguel angel rasteu
|
3f85562f21
|
#10177 Fix server name
|
2023-08-02 13:42:11 +02:00 |
|
Rafael Ameijeiras
|
f692dd4c7d
|
Merge branch 'ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string' into 'develop'
Ent 11693 15876 inverse interval no se activa para modulos web server de tipo string
See merge request artica/pandorafms!6218
|
2023-08-02 10:43:12 +00:00 |
|
Rafael Ameijeiras
|
e6eee88a63
|
Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop'
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil
See merge request artica/pandorafms!6010
|
2023-08-02 10:42:36 +00:00 |
|
Rafael Ameijeiras
|
d96977b883
|
Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop'
Ent 10562 nueva vista de detalle de alertas encoladas
See merge request artica/pandorafms!6273
|
2023-08-02 08:26:50 +00:00 |
|
Jonathan
|
7e8b26b73a
|
Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string
|
2023-08-02 09:29:42 +02:00 |
|
Jonathan
|
f063c5182e
|
#11693 fix warning/critical inverse for serverdata
|
2023-08-02 09:26:14 +02:00 |
|
miguel angel rasteu
|
57df761622
|
#11377 Fix sql query
|
2023-08-02 09:11:55 +02:00 |
|
Daniel Maya
|
ae22b99835
|
Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second
|
2023-08-02 09:10:04 +02:00 |
alejandro.campos@artica.es
|
700bb53df4
|
implemented pending alerts list for event server
|
2023-08-01 14:37:16 +02:00 |
|
Rafael Ameijeiras
|
965184c688
|
Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop'
Ent 11629 neflow filter no admite grupo all
See merge request artica/pandorafms!6151
|
2023-08-01 12:33:07 +00:00 |
|
Daniel Maya
|
0d321f5311
|
#11739 Fixed deprecated functions 3
|
2023-08-01 11:19:04 +02:00 |
|
Jonathan
|
84df4e1195
|
#11571 fix for firefox margin api token span
|
2023-08-01 11:11:24 +02:00 |
|
Jonathan
|
629f43c8f5
|
Merge branch 'develop' into ent-11571-contact-details
|
2023-08-01 10:27:40 +02:00 |
|
Rafael Ameijeiras
|
9f36729d30
|
Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop'
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias
See merge request artica/pandorafms!6291
|
2023-08-01 07:28:27 +00:00 |
Jorge Rincon
|
e7c2340e72
|
#11771 Fixed plugin field operation in module creation/edition
|
2023-07-31 15:30:39 +02:00 |
|
Rafael Ameijeiras
|
0c4331f9d4
|
Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop'
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario
See merge request artica/pandorafms!5988
|
2023-07-31 11:08:29 +00:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
miguel angel rasteu
|
9781809b22
|
#11713 Fix title
|
2023-07-31 09:27:50 +02:00 |
|
miguel angel rasteu
|
95e17b46bf
|
Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola
|
2023-07-31 09:03:03 +02:00 |
|
Rafael Ameijeiras
|
3a9404ad12
|
Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop'
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre
See merge request artica/pandorafms!6262
|
2023-07-31 06:57:32 +00:00 |
|
Jorge Rincon
|
89f604a602
|
#11771 Fixed plugin type fields
|
2023-07-28 14:03:24 +02:00 |
Daniel Rodriguez
|
42a5fc0716
|
Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop'
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados
See merge request artica/pandorafms!6051
|
2023-07-27 13:08:05 +00:00 |
|
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
|
Daniel Rodriguez
|
84f61c9022
|
Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop'
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada
See merge request artica/pandorafms!6028
|
2023-07-27 10:27:55 +00:00 |
|
Rafael Ameijeiras
|
9ce383d2ec
|
Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop'
Ent 11739 compatibilidad php 8 2
See merge request artica/pandorafms!6286
|
2023-07-27 09:17:24 +00:00 |
Daniel Cebrian
|
2c9f7e026e
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-07-26 15:58:26 +02:00 |
|
Daniel Maya
|
bee65bc575
|
#11739 Fixed deprecated functions
|
2023-07-26 14:18:20 +02:00 |
|
Daniel Rodriguez
|
c2d7c10442
|
Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop'
remove legacy visual console
See merge request artica/pandorafms!6140
|
2023-07-26 11:09:44 +00:00 |
|
Rafael Ameijeiras
|
d046e82208
|
Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop'
Ent 11644 desaparece selector en bulk operations en nodo centralizado
See merge request artica/pandorafms!6168
|
2023-07-25 11:04:38 +00:00 |
|
Rafael Ameijeiras
|
b4742f9e46
|
Merge branch 'ent-11698-proteccion-en-cascada-de-modulos-no-se-puede-configurar' into 'develop'
Ent 11698 proteccion en cascada de modulos no se puede configurar
See merge request artica/pandorafms!6216
|
2023-07-25 10:34:53 +00:00 |
|
Daniel Rodriguez
|
4b6be6596e
|
Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop'
Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa
See merge request artica/pandorafms!5858
|
2023-07-25 10:02:12 +00:00 |
|
Rafael Ameijeiras
|
391447c307
|
Merge branch 'ent-11708-error-al-visualizar-el-boton-de-delete-en-metaconsola-en-category-management' into 'develop'
Ent 11708 error al visualizar el boton de delete en metaconsola en category management
See merge request artica/pandorafms!6231
|
2023-07-25 09:05:16 +00:00 |
|
Rafael Ameijeiras
|
85a3e32c27
|
Merge branch 'ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver' into 'develop'
show server conf remote edition in at least one server element
See merge request artica/pandorafms!6197
|
2023-07-25 09:03:51 +00:00 |