Commit Graph

37939 Commits

Author SHA1 Message Date
Matias Didier 66eda7368d Merge branch 'ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada' into 'develop'
Ent 12034 Enlace público de dashboard que ha sido borrado no muestra nada

See merge request artica/pandorafms!6828
2024-01-31 08:21:45 +00:00
Daniel Maya 7acd687b9b #12687 Fixed export with json_ref 2024-01-31 09:21:27 +01:00
Daniel Cebrian 60d2733066 #12794 fixed login when user use external login 2024-01-30 18:22:20 +01:00
Daniel Cebrian 1882c7a624 #12833 fixed critical value in bulk operation 2024-01-30 17:58:41 +01:00
alejandro.campos@artica.es 0df4379926 fixed database ncm info 2024-01-30 17:47:43 +01:00
Daniel Maya a83577d1a8 #12687 Added import/export prd 4 2024-01-30 17:34:37 +01:00
Daniel Cebrian d4ceb1ac4d Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 17:11:30 +01:00
Daniel Cebrian f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Jonathan 727ee659ae #12791 fix wizard welcome 2024-01-30 15:37:04 +01:00
Daniel Cebrian 2531de8cb0 #12034 fixed page not access when dashboard is deleted 2024-01-30 14:58:04 +01:00
Rafael Ameijeiras f084893889 Merge branch 'ent-11844-etiquetas-module_each_ff-module_event_ff_critical-warning-normal-no-funcionan-en-el-data' into 'develop'
Ent-11844-etiquetas-module_each_ff-module_event_ff_critical-warning-normal-no-funcionan-en-el-data

Closes pandora_enterprise#11844

See merge request artica/pandorafms!6822
2024-01-30 13:55:00 +00:00
Jonathan f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Rafael Ameijeiras 9e1d5469ed Merge branch 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts' into 'develop'
#11642. Fix missing sql in MR

See merge request artica/pandorafms!6873
2024-01-30 13:53:43 +00:00
Rafael Ameijeiras 35b5644f9c Merge branch 'ent-12789-busqueda-por-regex-funciona-mal' into 'develop'
Ent 12789 Búsqueda por regex funciona mal

See merge request artica/pandorafms!6889
2024-01-30 13:52:57 +00:00
Daniel Cebrian b28c97b9b7 Merge branch 'develop' into ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada 2024-01-30 13:25:58 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Jonathan c008aee180 #12815 modules search space entity 2024-01-30 12:01:20 +01:00
Jonathan 6091071f03 #12718 fix error on signature package ums 2024-01-30 10:11:53 +01:00
Daniel Cebrian 4971c29819 #12789 fixed pagination in events 2024-01-30 09:25:17 +01:00
Daniel Cebrian 61e38865f6 Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal 2024-01-30 08:53:04 +01:00
Daniel Maya e07d89883f #12687 Added import/export prd 3 2024-01-29 17:38:01 +01:00
Daniel Cebrian 22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00
Rafael Ameijeiras db05fdb341 Merge branch 'ent-12681-16804-anadir-decimales-al-modulo-module_freepercentdisk' into 'develop'
Ent 12681 [#16804]Añadir decimales al modulo module_freepercentdisk

See merge request artica/pandorafms!6882
2024-01-29 15:20:53 +00:00
Rafael Ameijeiras 813deba7a5 Merge branch 'ent-12698-nuevos-mensajes-de-bienvenida-quedan-raros-si-el-usuario-no-tiene-full-name' into 'develop'
Ent 12698 nuevos mensajes de bienvenida quedan raros si el usuario no tiene full name

See merge request artica/pandorafms!6875
2024-01-29 15:20:27 +00:00
Luis 5631f5754b Merge branch 'develop' into 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts'
# Conflicts:
#   pandora_console/extras/mr/68.sql
2024-01-29 14:09:51 +00:00
Matias Didier 8269f5fcc6 Merge branch 'ent-11014-codigo-qr-en-user-detail-editor-mantiene-fija-su-posicion-mientras-se-redimensiona-ventana' into 'develop'
Ent 11014 codigo qr en user detail editor mantiene fija su posicion mientras se redimensiona ventana

See merge request artica/pandorafms!6415
2024-01-29 14:01:15 +00:00
Daniel Rodriguez c31c8d899f Merge branch 'ent-10847-modo-standby-en-vista-ha' into 'develop'
Ent-10847-modo-standby-en-vista-ha

Closes pandora_enterprise#10847

See merge request artica/pandorafms!6302
2024-01-29 12:58:40 +00:00
Daniel Cebrian 1738a06cf2 #12789 added tip in regex search 2024-01-29 13:42:09 +01:00
Diego Muñoz-Reja eba2f45ed1 Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop'
fix filter bug

See merge request artica/pandorafms!6761
2024-01-29 12:39:42 +00:00
Daniel Cebrian f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Matias Didier a2ea701ef0 Merge branch 'ent-12623-edicion-de-inventory-modules-se-despista-con-el-menu-principal' into 'develop'
Ent 12623 edicion de inventory modules se despista con el menu principal

See merge request artica/pandorafms!6876
2024-01-29 12:15:49 +00:00
Daniel Rodriguez 3db0090c0e Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop'
implement several changes in top-n connection report item

See merge request artica/pandorafms!6833
2024-01-29 11:14:58 +00:00
Rafael Ameijeiras a4b1ccb4e6 Merge branch 'ent-8497-nuevo-tipo-de-modulo-nativo-powershell-para-el-agente-windows' into 'develop'
Ent-8497-nuevo-tipo-de-modulo-nativo-powershell-para-el-agente-windows

Closes pandora_enterprise#8497

See merge request artica/pandorafms!6887
2024-01-29 09:35:32 +00:00
Rafael Ameijeiras c1b74ab7f0 Merge branch 'ent-12267-dashboard-mejora-del-widget-de-module-status' into 'develop'
add new filters widget modules status pandora_enterprise#12267

See merge request artica/pandorafms!6734
2024-01-29 09:33:56 +00:00
Rafael Ameijeiras 8bb2b46c48 Merge branch 'ent-12568-Falta-la-opcion-de-escoger-Exec-server-en-la-configuracion-de-Event-response' into 'develop'
fix missing fields

See merge request artica/pandorafms!6766
2024-01-29 09:32:50 +00:00
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop'
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
2024-01-29 09:30:55 +00:00
Rafael Ameijeiras c5c0b838e0 Merge branch 'ent-12807-error-sql-vista-de-alertas-en-develop' into 'develop'
Ent 12807 error sql vista de alertas en develop

See merge request artica/pandorafms!6888
2024-01-29 09:30:14 +00:00
Rafael Ameijeiras e39a87ebd7 Merge branch 'ent-12802-insert-data-no-recoge-bien-la-fecha' into 'develop'
Ent 12802 insert data no recoge bien la fecha

See merge request artica/pandorafms!6886
2024-01-29 09:16:00 +00:00
Daniel Cebrian b8973ecab4 #12681 fixed decimals in module freepercent 2024-01-29 09:04:03 +01:00
Daniel Cebrian 1b9cd2d36c #12681 fixed double parse 2024-01-26 15:26:29 +01:00
Daniel Cebrian babb7bce38 #12681 fixed double number parse 2024-01-26 15:06:09 +01:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada'
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
2024-01-26 13:42:59 +00:00
Daniel Cebrian 139b924410 #12681 added decimals in module windows 2024-01-26 14:01:32 +01:00
Diego Muñoz-Reja 04126c2407 Merge branch 'ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql' into 'develop'
add tables merge process pandora_enterprise#12352

See merge request artica/pandorafms!6722
2024-01-26 12:27:59 +00:00
Matias Didier ca3a9b3c56 Merge branch 'ent-12399-bugs-visuales-en-update-manager-offline' into 'develop'
fix visual error um-offline pandora_enterprise#12399

See merge request artica/pandorafms!6830
2024-01-26 12:27:17 +00:00
daniel bfca07dbd1 Merge remote-tracking branch 'origin/develop' into ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola 2024-01-26 10:30:24 +01:00
daniel bba32495a4 fix visual errors in msg umc offline pandora_enterprise#12399 2024-01-26 10:15:01 +01:00
Matias Didier 5b9bf180d8 Merge branch 'ent-11799-15999-eliminacion-de-intervalo-en-agentes-broker' into 'develop'
Ent 11799 15999 eliminacion de intervalo en agentes broker

See merge request artica/pandorafms!6885
2024-01-26 08:34:36 +00:00
daniel 51524f4263 Merge remote-tracking branch 'origin/develop' into ent-12399-bugs-visuales-en-update-manager-offline 2024-01-26 09:27:06 +01:00