14711 Commits

Author SHA1 Message Date
enriquecd
e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
artica
acbe200f90 Auto-updated build strings. 2017-07-03 00:01:16 +02:00
artica
ef6cf3d5d7 Auto-updated build strings. 2017-07-02 00:01:15 +02:00
artica
83fef400ae Auto-updated build strings. 2017-07-01 00:01:18 +02:00
mariopulido
b8c1227e7e Merge branch '1055_Vulnerabilidad_XSS_rev' into 'develop'
fixed error XSS in login_page

See merge request !637
2017-06-30 13:30:18 +02:00
daniel
b4ca9c958d fixed error XSS in login_page 2017-06-30 13:26:05 +02:00
artica
5eb53d599a Auto-updated build strings. 2017-06-30 00:01:18 +02:00
nramon
51412c8752 Merge branch '1055_Vulnerabilidad_XSS' into 'develop'
fixed error xss in login page

See merge request !631
2017-06-29 13:14:10 +02:00
daniel
bea2a38969 fixed error xss in login page 2017-06-29 13:07:35 +02:00
nramon
204681dbc0 Merge branch '1064-Acumulación-de-XMLs-al-finalizar-paradas-planificadas-dev' into 'develop'
Changed to disabled agents in planned downtime

See merge request !630
2017-06-29 12:21:54 +02:00
nramon
031ff3f6d2 Merge branch '310-Mejoras_pandora_revent_para_TMB_rev' into 'develop'
fixed autovalidate event in pandora_revent with extra_id

See merge request !621
2017-06-29 09:15:39 +02:00
nramon
5669c1b1a0 Merge branch '874_Anadir_posibilidad_de_ver_todos_los_eventos_rev' into 'develop'
fixed minor error

See merge request !628
2017-06-29 09:15:24 +02:00
artica
470ff1857b Auto-updated build strings. 2017-06-29 00:01:17 +02:00
daniel
39d090db1e fixed minor error 2017-06-28 16:39:54 +02:00
slerena
0150e9b555 Merge branch '1069-bad-events-sql-when-are-grouped-by-agent-dev' into 'develop'
Added good match to tags list

See merge request !627
2017-06-28 16:26:10 +02:00
Arturo Gonzalez
9348562ee4 Added good match to tags list 2017-06-28 16:20:57 +02:00
Daniel Maya
4244e23737 Changed to disabled agents in planned downtime 2017-06-28 16:20:20 +02:00
nramon
1b5d36d89f Merge branch '150-SNMP-alert-could-not-refer-agents' into 'develop'
Bug Fix: SNMP Alert could not refer agents. #150

Closes #150

See merge request !495
2017-06-28 08:37:53 +02:00
nramon
d7b45cb027 Merge branch '149-SNMP-console-doesnt-show-agent-aliases' into 'develop'
Modified SNMP Console to prefer agent aliases as SNMP agent if registered.  #149

Closes #149

See merge request !489
2017-06-28 08:37:29 +02:00
artica
bd6088135d Auto-updated build strings. 2017-06-28 00:01:14 +02:00
daniel
9b1338b4c2 fixed autovalidate event in pandora_revent with extra_id 2017-06-27 10:51:35 +02:00
artica
d678760e5d Auto-updated build strings. 2017-06-27 00:01:15 +02:00
vgilc
9cb67478aa Merge branch '698-Modulos-predictivos-no-se-inician-en-la-versión-open-2' into 'develop'
Fix creation prediction modules, add prediction_module param when create - #698

See merge request !619
2017-06-26 16:22:10 +02:00
vgilc
652f89ec66 Merge branch '1046-Macros_en_modulos_de_plugin' into 'develop'
fixed error in plugin server agent for alias

See merge request !620
2017-06-26 16:21:26 +02:00
daniel
f681f63ccb fixed error in plugin server agent for alias 2017-06-26 15:42:34 +02:00
enriquecd
1a34c7413c Fix creation prediction modules, add prediction_module param when create - #698 2017-06-26 12:22:05 +02:00
artica
ef22945b80 Auto-updated build strings. 2017-06-26 00:01:16 +02:00
artica
849a4d14e1 Auto-updated build strings. 2017-06-25 00:01:15 +02:00
artica
6ac3df710e Auto-updated build strings. 2017-06-24 00:01:16 +02:00
vgilc
1f2c3f3ad7 Merge branch '929-fixed-netflow-live-view-in-meta-dev' into 'develop'
Fixed nwtflow live view filter table

See merge request !531
2017-06-23 14:11:15 +02:00
vgilc
a151a7e0b8 Merge branch '884-groups-hierachy-in-select-dev' into 'develop'
Fixed groups select width

See merge request !523
2017-06-23 14:02:50 +02:00
artica
41e1d42b22 Auto-updated build strings. 2017-06-23 00:01:16 +02:00
vgilc
87db7368c0 Merge branch '1028-Filtro-de-búsqueda-Agent-Detail-se-borra-al-cambiar-de-página-dev' into 'develop'
Fixed error in filter pagination

See merge request !597
2017-06-22 10:21:40 +02:00
artica
0ea3bc90fb Auto-updated build strings. 2017-06-22 00:01:16 +02:00
vgilc
6e8ef54bec Merge branch '310-Mejoras_pandora_revent_para_TMB' into 'develop'
fixed errors in pandora revent

See merge request !608
2017-06-21 15:29:03 +02:00
daniel
d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
artica
1b262808f2 Auto-updated build strings. 2017-06-21 00:01:18 +02:00
vgilc
72202ae357 Merge branch '984-Meter-fondo-de-imagen-de-cuadros-grises-blancos-para-textarea-de-etiquetas-de-texto-en-la-consola-visual' into 'develop'
Change vconsole label editor background color when rightclick on it - #984

See merge request !586
2017-06-20 11:31:26 +02:00
vgilc
ab45409cf0 Merge branch '330-Agentes-sin-alertas-dev' into 'develop'
Added new functionality to create alerts on modules without alerts

See merge request !546
2017-06-20 11:16:43 +02:00
Daniel Maya
c678d8ba50 Merge branch 'develop' into '330-Agentes-sin-alertas-dev'
# Conflicts:
#   pandora_console/include/functions_ui.php
2017-06-20 11:06:24 +02:00
Daniel Maya
a81b5b8239 Fixed error in filter pagination 2017-06-20 10:52:02 +02:00
artica
e56d147345 Auto-updated build strings. 2017-06-20 00:01:16 +02:00
slerena
c1166f280a Merge branch '1025-bug-with-more-than-6-months-charts-dev' into 'develop'
Fixed more than 6 months charts

See merge request !591
2017-06-19 17:50:48 +02:00
vgilc
24a9370084 Merge branch '976-Header-erróneo-en-index-php' into 'develop'
Show enterprise icon in login header when is not defined in config - #976

See merge request !588
2017-06-19 16:09:19 +02:00
vgilc
6c087b0f6b Merge branch '989-um-online-open-js-error-dev' into 'develop'
Added correct button declaration

See merge request !561
2017-06-19 09:10:47 +02:00
vgilc
4b031d3337 Merge branch '992-Modulo-data-server-se-queda-en-desconocido-dev' into 'develop'
Fixed current_interval in data server

See merge request !572
2017-06-19 09:10:14 +02:00
vgilc
2e72025bbf Merge branch '874-Añadir-posibilidad-de-ver-todos-los-eventos' into 'develop'
add checkbox for show all events in view agent detail

See merge request !585
2017-06-19 09:09:24 +02:00
artica
5e4b1d6965 Auto-updated build strings. 2017-06-19 00:01:14 +02:00
artica
89ea98f505 Auto-updated build strings. 2017-06-18 00:01:14 +02:00
artica
8e94fd58f4 Auto-updated build strings. 2017-06-17 00:01:16 +02:00