25562 Commits

Author SHA1 Message Date
marcos
e221175bf4 updated changes 2020-07-16 15:57:28 +02:00
Luis Calvo
4b1d586ef0 Fixed and added strfdate formats 2020-07-16 14:07:29 +02:00
Daniel Rodriguez
d6fc3a6195 Merge branch 'ent-5967-botones-de-events-responses-no-son-iguales' into 'develop'
fixed visual style repsonse buttons

See merge request artica/pandorafms!3319
2020-07-16 12:16:57 +02:00
Daniel Rodriguez
100db2d4db Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop'
Fixed error link builder in VC

See merge request artica/pandorafms!3275
2020-07-16 12:11:51 +02:00
Daniel Rodriguez
4bf2a2fedd Merge branch 'ent-5909-el-formato-encajado-de-la-busqueda-no-tiene-sentido' into 'develop'
fixed error

See merge request artica/pandorafms!3266
2020-07-16 12:10:31 +02:00
Alejandro Fraguas
1fb257108c Merge branch 'ent-4425-api-cli-eventos-en-progreso' into 'develop'
Ent 4425 api cli eventos en progreso

See merge request artica/pandorafms!3265
2020-07-16 11:08:34 +02:00
marcos
10b2fe25ba fixed error 2020-07-16 10:57:27 +02:00
marcos
c76238bdb0 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-16 09:57:14 +02:00
artica
8b85bba631 Auto-updated build strings. 2020-07-16 01:00:20 +02:00
marcos
a6a97d264e changed event in progress method api refactored 2020-07-15 23:41:25 +02:00
marcos
9632b36551 changed event in progress method 2020-07-15 23:36:21 +02:00
fbsanchez
c8d86a4bdb minor fix 2020-07-15 13:46:51 +02:00
Daniel Rodriguez
d9ceb1d554 Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
2020-07-15 13:05:14 +02:00
fbsanchez
dbf1265fd0 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-07-15 11:38:18 +02:00
Alejandro Campos
0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event'
# Conflicts:
#   pandora_console/extras/mr/40.sql
2020-07-15 09:30:35 +02:00
alejandro-campos
4edef7099b added check to display log sources info box when log collector activated 2020-07-15 09:25:39 +02:00
artica
593ed43f10 Auto-updated build strings. 2020-07-15 01:00:17 +02:00
Daniel Rodriguez
846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
2020-07-14 18:10:11 +02:00
alejandro-campos
b073a64c20 deleted references to table log4x 2020-07-14 17:26:47 +02:00
alejandro-campos
909d7cba58 Implemented log source status info box in agent view 2020-07-14 17:12:38 +02:00
Daniel Rodriguez
76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop'
Ent 5769 borrado de eventos no pide confirmacion

See merge request artica/pandorafms!3271
2020-07-14 11:04:03 +02:00
Daniel Rodriguez
8b8fd7bf30 Merge branch 'ent-5764-consola-visual-pantalla-completa-autohide' into 'develop'
Restored autoHide for controls modal in visual console with full screen

Closes pandora_enterprise#5764

See merge request artica/pandorafms!3299
2020-07-14 11:03:33 +02:00
Daniel Rodriguez
52dc38fcb2 Merge branch 'ent-5672-Graficas-gauge-no-se-muestran-bien-en-PDF' into 'develop'
Fixed error in gauges

See merge request artica/pandorafms!3261
2020-07-14 11:01:21 +02:00
marcos
26e0703617 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-14 10:05:18 +02:00
artica
f81e66084c Auto-updated build strings. 2020-07-14 01:00:16 +02:00
fbsanchez
45062874ce minor fix disabled textareas 2020-07-13 14:06:52 +02:00
fbsanchez
a0028e47ad Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-07-13 13:56:54 +02:00
fbsanchez
dc5767705f minor fixes 2020-07-13 13:56:41 +02:00
Alejandro Fraguas
f79dd6db43 Merge branch 'ent-no-muestra-las-imagenes-en-el-modal-de-error-del-modulo-database-maintenance-en-metaconsola' into 'develop'
5722-fixed image not found

See merge request artica/pandorafms!3263
2020-07-13 13:22:41 +02:00
Daniel Rodriguez
1e31eae1a2 Merge branch 'ent-6130-Errores-en-Custom-graph-Informes-de-metaconsola' into 'develop'
Fixed errors custom graph metaconsole

See merge request artica/pandorafms!3376
2020-07-13 13:13:29 +02:00
marcos
2a62f3328a show hidden title on setup notifications 2020-07-13 13:00:47 +02:00
Alejandro Fraguas
150e8b1ddc Merge branch 'ent-5532-Edicion-creacion-de-templates-acciones-comandos-MODO-CENTRALIZADO' into 'develop'
Ent 5532 edicion creacion de templates acciones comandos modo centralizado

See merge request artica/pandorafms!3273
2020-07-13 12:23:47 +02:00
daniel
f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Barbero Martin
293cdc6c08 Fixed errors custom graph metaconsole 2020-07-13 11:48:11 +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
Daniel Rodriguez
ad93a7c681 Merge branch 'ent-5445-Item-prediction-date-no-funciona-correctamente-en-meta' into 'develop'
fix prediction date item in meta

See merge request artica/pandorafms!3340
2020-07-13 11:12:53 +02:00
Daniel Rodriguez
47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop'
Change owner event responses

See merge request artica/pandorafms!3294
2020-07-13 11:12:02 +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
Alejandro Fraguas
bd6904b99f Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop'
Fixed xss event comments vulnerabiluty and some acls on event ajax

See merge request artica/pandorafms!3335
2020-07-13 10:06:26 +02:00
Daniel Rodriguez
fe48741abe Merge branch 'ent-1972-Graficas-en-informes' into 'develop'
fixed legend max 10 modules for chart

See merge request artica/pandorafms!3337
2020-07-13 10:02:56 +02:00
daniel
c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
Junichi Satoh
925e765784 Fixed tentacle server startup script for FreeBSD. 2020-07-13 13:42:43 +09:00
artica
313607efdf Auto-updated build strings. 2020-07-13 01:00:12 +02:00
artica
e80252287c Auto-updated build strings. 2020-07-12 01:00:12 +02:00
artica
9d16783254 Auto-updated build strings. 2020-07-11 01:00:19 +02:00
fbsanchez
23641e45bb Entity with enterprise capabilites 2020-07-10 13:38:42 +02:00
Ramon Novoa
b487153800 Lock on LIFO mode if the agent does not exist to prevent duplicates.
Ref pandora_enterprise#5908
2020-07-10 13:21:59 +02:00
Daniel Barbero Martin
b87c2d986f Fixed errors po and mo 2020-07-10 12:36:57 +02:00
Daniel Rodriguez
9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop'
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
2020-07-10 10:16:34 +02:00
Daniel Rodriguez
9441b688a2 Merge branch 'ent-3879-obtener-estado-agente-cli' into 'develop'
Added option for get the agent status

Closes pandora_enterprise#3879

See merge request artica/pandorafms!3295
2020-07-10 10:13:18 +02:00