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
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
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
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
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
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
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
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
Daniel Rodriguez
a83b10ff97
Merge branch 'ent-1957-Informe-agrupado-general' into 'develop'
...
Implemented all-in-row data for grouped general report
See merge request artica/pandorafms!3351
2020-07-10 10:11:57 +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
Daniel Rodriguez
0d68dde3db
Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop'
...
fixed weight legend
See merge request artica/pandorafms!3339
2020-07-10 10:10:42 +02:00
artica
941dfc2b62
Auto-updated build strings.
2020-07-10 01:00:16 +02:00
Alejandro Fraguas
ddc8a98dc0
Merge branch 'ent-6000-operaciones-masivas-de-servicios' into 'develop'
...
Ent 6000 operaciones masivas de servicios
See merge request artica/pandorafms!3361
2020-07-09 17:02:59 +02:00
fbsanchez
5df418d226
MR changes
2020-07-09 16:56:51 +02:00
fbsanchez
231ba795dd
MR update
2020-07-09 16:53:03 +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
Daniel Rodriguez
efb8146b05
Merge branch 'ent-5705-consistencia-db-metaconsola-pandora_db' into 'develop'
...
Metaconsole cleanup
See merge request artica/pandorafms!3310
2020-07-09 14:50:14 +02:00
fbsanchez
865c2eb208
allowed service create propagate exceptions
2020-07-09 11:35:04 +02:00
artica
a410ebffb4
Auto-updated build strings.
2020-07-09 01:00:14 +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
artica
3b091525f5
Auto-updated build strings.
2020-07-08 01:00:15 +02:00
fbsanchez
3d493f14da
massive services
2020-07-07 19:10:24 +02:00
fbsanchez
69d06e77cd
fix recursion while searching group children perl
2020-07-07 17:19:21 +02:00
fbsanchez
1944b644a1
fix recursion while searching group children perl
2020-07-07 17:19:02 +02:00
Daniel Rodriguez
18948cb979
Merge branch 'ent-6096-Label-en-Automatic-combined-Graph' into 'develop'
...
fixed errors in automatic combined graph
See merge request artica/pandorafms!3350
2020-07-07 16:07:13 +02:00
daniel
51104136a9
fixed errors in automatic combined graph
2020-07-07 16:07:13 +02:00