Commit Graph

28160 Commits

Author SHA1 Message Date
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
Daniel Rodriguez fae4b284e4 Merge branch 'ent-7945-500-al-crear-informe' into 'develop'
Ent 7945 500 al crear informe

See merge request artica/pandorafms!4373
2021-08-27 12:07:24 +00:00
Daniel Rodriguez a0ff35670b Merge branch 'ent-7747-bug-en-descarga-de-plugins' into 'develop'
Plugins get file correct downlad link

See merge request artica/pandorafms!4247
2021-08-27 10:49:36 +00:00
Daniel Rodriguez a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop'
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
2021-08-27 10:46:39 +00:00
Daniel Rodriguez 16fff8b2f5 Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop'
Change snmpwalk behaviour in module configuration

Closes pandora_enterprise#7619

See merge request artica/pandorafms!4221
2021-08-27 10:45:42 +00:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
Daniel Rodriguez c172afe1ce Merge branch 'ent-7940-Bug-items-de-informes-en-open' into 'develop'
Ent 7940 bug items de informes en open

See merge request artica/pandorafms!4372
2021-08-26 10:13:13 +00:00
Daniel Rodriguez 25c6a3eef4 Merge branch 'ent-7805-devolver-informacion-del-pandora-server-al-hacer-un-status' into 'develop'
Update the description for pandora_ha.

See merge request artica/pandorafms!4371
2021-08-26 10:12:23 +00:00
Daniel Maya 0a79014480 #7495 fixed report name 2 2021-08-26 12:03:14 +02:00
Daniel Maya 88c42d953f #7495 fixed report name 2021-08-26 12:01:59 +02:00
Daniel Rodriguez f33ccf1db9 Merge branch 'ent-7613-wizard-configuracion-inicial' into 'develop'
Fix select2 write search field on dialog

See merge request artica/pandorafms!4242
2021-08-26 08:55:57 +00:00
Ramon Novoa 7e27731ce2 Change more references to Pandora FMS HA Database tool. 2021-08-26 10:47:52 +02:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Daniel Rodriguez d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop'
add node name on event details

See merge request artica/pandorafms!4274
2021-08-25 13:01:02 +00:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop'
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
2021-08-25 13:00:42 +00:00
Daniel Rodriguez e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop'
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
2021-08-25 12:57:40 +00:00
Daniel Rodriguez 61baf63a6a Merge branch 'ent-7819-500-al-ordernar-items-de-informes' into 'develop'
fixed error 500 when sort report items

See merge request artica/pandorafms!4314
2021-08-25 12:52:33 +00:00
Daniel Rodriguez 3be8971360 Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop'
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos

See merge request artica/pandorafms!4365
2021-08-25 12:52:06 +00:00
Daniel Maya c8fb8a441f #7940 Fixed server filter in open 2021-08-25 13:43:13 +02:00
Ramon Novoa 3056874b52 Update the description for pandora_ha.
Ref. pandora_enterprise#7805.
2021-08-25 11:47:50 +02:00
Daniel Rodriguez 5ba27998db Merge branch 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' into 'develop'
Fixed issue with select2 fields

Closes pandora_enterprise#7666

See merge request artica/pandorafms!4230
2021-08-25 09:28:25 +00:00
José González 8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González 357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
Daniel Rodriguez 452d986ab5 Merge branch 'ent-7878-errata-funcion-get_console_api_url-en-db-pm' into 'develop'
Ensure latest slash in console url

See merge request artica/pandorafms!4368
2021-08-25 06:55:31 +00:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop'
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
2021-08-24 12:28:03 +00:00
José González a930dc1d8a Merge branch 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' of https://brutus.artica.es:8081/artica/pandorafms into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-24 11:52:51 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop'
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
2021-08-24 08:13:02 +00:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
Daniel Rodriguez 3dc6db320e Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop'
Fixed SLA report items creating empty extra item

See merge request artica/pandorafms!4253
2021-08-23 10:50:10 +00:00
Daniel Rodriguez 9cf9d99e7b Merge branch 'ent-7908-BIS-Error-visual-menu-principal-consola' into 'develop'
Fix visual issue with position

Closes pandora_enterprise#7908

See merge request artica/pandorafms!4367
2021-08-23 10:49:39 +00:00
Daniel Rodriguez 76ead757b0 Merge branch 'ent-7689-busqueda-de-usuarios-con-paginacion' into 'develop'
fixed error with pagination user filter

See merge request artica/pandorafms!4209
2021-08-23 10:48:46 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
fbsanchez f0c68a0f54 Ensure latest slash in console url 2021-08-23 12:17:03 +02:00
Daniel Rodriguez 8a7dbf653b Merge branch 'ent-7909-campos-Data-no-muestran-valores-String' into 'develop'
Fix issues with string values

Closes pandora_enterprise#7909

See merge request artica/pandorafms!4366
2021-08-23 08:37:58 +00:00
José González 9c508e05c1 Fix visual issue with position 2021-08-23 10:04:34 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
José González 2f0681c29b Fix issues with string values 2021-08-20 14:11:03 +02:00
Daniel Rodriguez 8b9cb51d1e Merge branch 'ent-7884-metaconsola-no-se-pueden-crear-items-en-consola-visual' into 'develop'
Fix issue with redeclaration of functions_metaconsole.php

Closes pandora_enterprise#7884

See merge request artica/pandorafms!4362
2021-08-20 09:13:38 +00:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
Jose Gonzalez 7c89b271ac Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-19 14:31:14 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Daniel Rodriguez ffa2aa717b Merge branch 'ent-7908-error-visual-grave-menu-principal-consola' into 'develop'
Fix issue with initial visual problems

See merge request artica/pandorafms!4363
2021-08-19 08:21:08 +00:00
José González b515bfe443 Fix merge 2021-08-19 09:39:13 +02:00