14803 Commits

Author SHA1 Message Date
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
Daniel Maya
42b822a07a Erase functionality 2017-06-22 15:27:00 +02:00
Daniel Maya
b19164cbd2 Fixed visual console render img 2017-06-22 11:55:30 +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
Arturo Gonzalez
e6efe5825b Added active filters to snmp console 2017-06-22 09:28:07 +02:00
artica
0ea3bc90fb Auto-updated build strings. 2017-06-22 00:01:16 +02:00
Arturo Gonzalez
ec2872b83b Added second check to period field in module charts (admin have diferent field name) 2017-06-21 16:41:31 +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
Arturo Gonzalez
2737b6567a Added Borja line to fix module graph period in visual console with non-administrator users 2017-06-21 14:35:22 +02:00
daniel
d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
Arturo Gonzalez
ff7de5ed4f Added alias to snmp alert agent object 2017-06-21 11:06:52 +02:00
artica
1b262808f2 Auto-updated build strings. 2017-06-21 00:01:18 +02:00
enriquecd
bd537cd891 Change connection data for mysql queries - #1030 2017-06-20 17:45:01 +02:00
Daniel Maya
c942fce068 added snmp_browser.ajax 2017-06-20 15:47:29 +02:00
Daniel Maya
b7f4ecbe69 update css and added gif 2017-06-20 15:46:35 +02:00
Daniel Maya
b38b41b942 updated files 2017-06-20 15:32:24 +02:00
Daniel Maya
6703b1e9e5 Style change text in user management 2017-06-20 12:01:34 +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
Daniel Maya
4398b47d92 updated 2017-06-20 10:31:14 +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
Arturo Gonzalez
687e970c8e Fixed more than 6 months charts 2017-06-16 14:42:16 +02:00
artica
0059f79012 Auto-updated build strings. 2017-06-16 00:01:14 +02:00
Ramon Novoa
035829ce91 Replaced procedures with prepared statements.
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
2017-06-15 15:43:00 +02:00
Daniel Maya
7bf9860aaa Changed agent name by alias 2017-06-15 15:40:12 +02:00
Daniel Maya
e68858e4c2 new feature in snmp browser 2017-06-15 15:12:27 +02:00
Ramon Novoa
d2d56b4b89 Add a missing MR. 2017-06-15 13:47:20 +02:00
enriquecd
44fb3f248d Show enterprise icon in login header when is not defined in config - #976 2017-06-15 11:01:39 +02:00
Ramon Novoa
7c3ef317b0 Revert "Add a missing MR."
This reverts commit 16b0da1515fe327b56d89d1e041030ce5b9a78da.
2017-06-15 10:50:31 +02:00
Ramon Novoa
16b0da1515 Add a missing MR. 2017-06-15 10:33:30 +02:00
artica
70c651466e Auto-updated build strings. 2017-06-15 00:01:27 +02:00
enriquecd
c7c158297d Fix module editor can not show name with quotes - #1019 2017-06-14 19:12:17 +02:00
enriquecd
8b83b94a40 Change vconsole label editor background color when rightclick on it - #984 2017-06-14 16:59:59 +02:00
daniel
80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
Daniel Maya
f07f0d1a00 fixed conflict 2017-06-14 12:06:41 +02:00
vgilc
d8fc3ac9e9 Merge branch 'No-funciona-módulo-system-dev' into 'develop'
Fixed problem in data display snmp wizard

See merge request !534
2017-06-14 11:50:26 +02:00
vgilc
528b9abba6 Merge branch '996-Filtro-SNMP-desaparece-dev' into 'develop'
Fixed problem with snmp filter

See merge request !574
2017-06-14 11:48:49 +02:00
vgilc
babc431c82 Merge branch '948-Borrado-de-traps-agrupados-dev' into 'develop'
fixed deleting grouped traps

See merge request !549
2017-06-14 11:48:01 +02:00
vgilc
8f693ee9c8 Merge branch '995-Agent-name-en-operaciones-masivas-de-plugins-dev' into 'develop'
changed agent name by alias

See merge request !566
2017-06-14 11:46:13 +02:00