Commit Graph

5177 Commits

Author SHA1 Message Date
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Rodriguez 492c7f90cf Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
fixed error

See merge request artica/pandorafms!3321
2020-07-13 11:13:24 +02:00
Alejandro Fraguas fbb251f358 Merge branch 'ent-5468-parsear-campos-exec-server-por-si-hay-espacios-sobre-todo-ip' into 'develop'
Ent 5468 parsear campos exec server por si hay espacios sobre todo ip

See merge request artica/pandorafms!3334
2020-07-13 10:54:42 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
Daniel Rodriguez 8b24faa129 Merge branch 'ent-2002-Remote-component-centralizado' into 'develop'
Blocked create and update of remote component group when meta has centralized management

Closes pandora_enterprise#2002

See merge request artica/pandorafms!3272
2020-07-10 10:11:25 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop'
MR change smart services

See merge request artica/pandorafms!3316
2020-07-08 18:01:16 +02:00
Daniel Rodriguez 8925821a2b Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop'
Fixed minor bug field10 param

See merge request artica/pandorafms!3346
2020-07-08 11:04:47 +02:00
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
Luis Calvo 88d72b3d66 Fixed minor bug field10 param 2020-07-01 14:41:31 +02:00
manuel.montes 5502ee6b01 Fixed bug in module manage meta 2020-07-01 10:16:55 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Daniel Maya db452f41f5 Added trim in address 2020-06-26 10:11:41 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop'
changed console and audit log locations

See merge request artica/pandorafms!3278
2020-06-25 15:28:13 +02:00
daniel 36e57ddd1d New report last value 2020-06-25 12:18:37 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/install.php
2020-06-25 11:25:43 +02:00
Daniel Rodriguez 5aef38dd72 Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop'
fixes in reports front page default setup

See merge request artica/pandorafms!3250
2020-06-24 12:43:23 +02:00
Manuel Montes 549a17a428 Ent 5470 se duplican los sistemas operativos 2020-06-23 14:45:04 +02:00
Alejandro Campos 9ce4c90456 Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-06-23 10:04:24 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Alejandro Campos a81e4acbb7 Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
# Conflicts:
#   pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
Alejandro Fraguas 7be71080eb Merge branch 'ent-5959-xxs-special-day' into 'develop'
ignore keys xss special days

See merge request artica/pandorafms!3323
2020-06-22 09:37:07 +02:00
Alejandro Fraguas 487ab4e86a Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
ignore keys on xss manage angent groups

See merge request artica/pandorafms!3322
2020-06-22 09:25:05 +02:00
alejandro-campos d64ff918d6 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:22:28 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
marcos 1f4de3ee4d ignore keys xss special days 2020-06-19 10:53:14 +02:00
marcos 415a8aa8b6 ignore keys on xss manage angent groups 2020-06-19 10:44:43 +02:00
marcos 40c0d4ea09 fixed error 2020-06-18 17:09:22 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
Alejandro Fraguas dbdf5edd0c Merge branch 'ent-636-Campos-Target-IP-y-Export-target-en-politicas' into 'develop'
Changed target ip selector in WMI server policy modules

See merge request artica/pandorafms!3186
2020-06-17 17:49:12 +02:00
alejandro-campos 9f4fed57b1 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-17 15:27:14 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
fbsanchez 1eea17f9b9 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-15 17:41:53 +02:00
Alejandro Fraguas 495b13f387 Merge branch 'ent-5959-xxs-special-day' into 'develop'
fixed vulnerability on special days

See merge request artica/pandorafms!3286
2020-06-15 12:14:42 +02:00
Alejandro Fraguas 80774e9942 Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
fixed security error on manage agent group

See merge request artica/pandorafms!3288
2020-06-15 10:33:50 +02:00
Alejandro Fraguas 62ce710b5b Merge branch 'ent-5954-XSS-Tags' into 'develop'
Control vulnerable fields

Closes pandora_enterprise#5954

See merge request artica/pandorafms!3283
2020-06-15 10:02:20 +02:00
Alejandro Fraguas af8326c042 Merge branch 'ent-5952-XSS-Netscan' into 'develop'
fix XSS

See merge request artica/pandorafms!3282
2020-06-15 09:33:08 +02:00
Daniel Rodriguez 146879ee8d Merge branch 'ent-5856-Se-pierde-filtro-al-paginar-en-REPORTS' into 'develop'
Fixed errors filter search with pagination

See merge request artica/pandorafms!3226
2020-06-15 08:29:14 +02:00
fbsanchez b4219472f2 Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-11 14:55:36 +02:00
fbsanchez 057fcea724 DB2 discovery 2020-06-11 14:53:34 +02:00
Daniel Rodriguez d3a34c5f00 Merge branch 'ent-5779-open-aviso-de-exclusividad-de-enterprise-en-bulk-operations' into 'develop'
Fix #5779

See merge request artica/pandorafms!3233
2020-06-11 14:03:14 +02:00
Daniel Rodriguez a8328bd4f1 Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop'
Ent 5568 case insensitive para el buscador de usuarios

See merge request artica/pandorafms!3244
2020-06-11 14:00:52 +02:00
marcos b3a270d0b3 fixed security error on manage agent group 2020-06-09 12:43:58 +02:00
marcos 9ddfde1774 fixed error with update event comments 2020-06-09 12:02:31 +02:00
marcos cfe30d5b7d fixed vulnerability on special days 2020-06-09 10:37:11 +02:00
alejandro-campos 442b40ad97 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-09 09:30:16 +02:00