tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,683 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

11242 Commits

Author SHA1 Message Date
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
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
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
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
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 16b0da1515.
 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 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
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
vgilc 31161ff034 Merge branch '698-Modulos-predictivos-no-se-inician-en-la-versión-open' into 'develop' 
Take prediction_module param when create module and init module - #698

See merge request !548
 2017-06-14 11:36:33 +02:00
vgilc 7bfd3254a7 Merge branch '656-changes-in-system-log-viewer-dev' into 'develop' 
Added changes

See merge request !518
 2017-06-14 11:32:44 +02:00
vgilc 49e3beea27 Merge branch '869-Insert-data-no-funciona' into 'develop' 
Fix insert data extension, bad parameters in xml format - #869

See merge request !492
 2017-06-14 11:30:55 +02:00
vgilc 3ae20056fc Merge branch '990-advise-links-doesnt-work-in-open-version-dev' into 'develop' 
Changed bad ajax call

See merge request !562
 2017-06-14 11:05:38 +02:00
vgilc 9b35a7f5ba Merge branch '975-dot-and-plain-files-path-in-windows-dev' into 'develop' 
Added OS filter

See merge request !557
 2017-06-14 10:48:44 +02:00
vgilc 91f8e9d65c Merge branch '1010-Actualizar-servername-cuando-haya-cambio-de-mayúculas' into 'develop' 
fixed errors caase sensitive servername

See merge request !583
 2017-06-14 10:41:46 +02:00
artica d090692412 Auto-updated build strings. 2017-06-14 00:01:12 +02:00
daniel d85ec51220 fixed errors caase sensitive servername 2017-06-13 12:42:21 +02:00
Arturo Gonzalez c506c9cce6 Added a condition to small charts 2017-06-13 09:45:08 +02:00
Arturo Gonzalez e237198d06 Added a final fix 2017-06-13 09:26:08 +02:00
artica 8ba1cf66af Auto-updated build strings. 2017-06-13 00:02:03 +02:00
vgilc 03e17e335f Merge branch '637-moduledata-macro-dev' into 'develop' 
Added moduledata macro help text

See merge request !580
 2017-06-12 18:04:54 +02:00