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

11371 Commits

Author SHA1 Message Date
artica b0c2a9e25c Auto-updated build strings. 2017-07-13 00:01:16 +02:00
enriquecd c9219107bf Hold mark labels font size when autorefresh and fix drag map font size bug - #1115 2017-07-12 18:49:39 +02:00
vgilc f907f3cdb7 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes' into 'develop' 
Fix automatic combined graph macros in name and labels - #1088

See merge request !657
 2017-07-12 10:12:45 +02:00
artica 7536b1fd56 Auto-updated build strings. 2017-07-12 00:01:15 +02:00
enriquecd 39fb79bbb4 Fix automatic combined graph macros in name and labels - #1088 2017-07-11 18:22:25 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
Arturo Gonzalez 2402141c4f Changed text line 2017-07-11 10:04:26 +02:00
artica 2872686042 Auto-updated build strings. 2017-07-11 00:01:16 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
artica 7002f24586 Auto-updated build strings. 2017-07-10 00:01:15 +02:00
artica 6fff54b0f0 Auto-updated build strings. 2017-07-09 00:01:15 +02:00
artica f1520483fd Auto-updated build strings. 2017-07-08 00:01:21 +02:00
Arturo Gonzalez a9ca7b6a8d Added a virgensita de guadalupe fix to generate networkmaps in windows systems 2017-07-07 13:21:05 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc 35d722a13f Merge branch 'upload-new-ehorus-bundle' into 'develop' 
Upload new ehorus buldle

See merge request !633
 2017-07-07 10:52:57 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00
vgilc 3c2ef0ea2c Merge branch '155-4248-calculo-dinamico-de-umbrales-en-tipos-booleanos-sla-disponibilidad' into 'develop' 
Fixes boolean modules threshold calc

Closes #155

See merge request !646
 2017-07-07 09:37:37 +02:00
artica 60e92e759b Auto-updated build strings. 2017-07-07 00:01:19 +02:00
fbsanchez ff6173ae54 Fixes boolean modules threshold calc 2017-07-06 14:10:08 +02:00
artica 872e36672c Auto-updated build strings. 2017-07-06 00:01:16 +02:00
vgilc ca45db3ba3 Merge branch '884-low-width-in-groups-select-agent-manager-section-dev' into 'develop' 
Fixed field

See merge request !623
 2017-07-05 12:06:54 +02:00
vgilc 129b64e870 Merge branch '884-low-width-in-groups-select-dev' into 'develop' 
Fixed selector

See merge request !622
 2017-07-05 12:06:39 +02:00
vgilc cbc813a3a5 Merge branch '975-fixed-windows-graphviz-bin-path-conf-value-dev' into 'develop' 
Fixed conf field

See merge request !629
 2017-07-05 12:01:46 +02:00
vgilc 0fd6d38a6b Merge branch '853-Custom-SQL-que-afecten-a-BDD-de-histórico-enterprise-open' into 'develop' 
Add historical db check to reports template SQL items - #853

See merge request !640
 2017-07-05 11:45:18 +02:00
vgilc 6cc4e1756a Merge branch '1025-problems-with-charts-when-have-history-db-data-dev' into 'develop' 
Added changes to resolve bad history database data

See merge request !643
 2017-07-05 11:42:15 +02:00
artica 7e376fc6dd Auto-updated build strings. 2017-07-05 00:01:15 +02:00
artica 2fef8a39dd Auto-updated build strings. 2017-07-04 00:01:16 +02:00
enriquecd f2f7a8179f Fix image align when create a static graph in vconsole - #844 2017-07-03 15:24:30 +02:00
Arturo Gonzalez b282063325 Added changes to resolve bad history database data 2017-07-03 15:09:31 +02:00
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
Ramon Novoa 9a85c47f9e Replaced references to switch.ehorus.com with portal.ehorus.com. 2017-06-30 21:14:55 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +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
m-lopez-f 25ede84c47 Upload new ehorus buldle 2017-06-29 16:10:25 +02:00
daniel bea2a38969 fixed error xss in login page 2017-06-29 13:07:35 +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
Arturo Gonzalez e642c15c78 Fixed conf field 2017-06-28 17:49:39 +02:00
daniel 39d090db1e fixed minor error 2017-06-28 16:39:54 +02:00
Arturo Gonzalez 9348562ee4 Added good match to tags list 2017-06-28 16:20:57 +02:00
enriquecd 78bb583824 Use session and not exec sql if already exists acl perms in session - #1017 2017-06-28 11:31:45 +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
Arturo Gonzalez 99ad586661 Fixed field 2017-06-27 11:35:48 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +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
enriquecd 1a34c7413c Fix creation prediction modules, add prediction_module param when create - #698 2017-06-26 12:22:05 +02:00
Daniel Maya 8d378b4b60 Fixed display of data 2017-06-26 11:29:56 +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
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
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 e86c87d23b Added refresh by user 2017-06-21 13:50:05 +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
enriquecd 7e383262bb Change tserver_export_data to varchar 600 - #1015 2017-06-20 13:56:20 +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
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 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 c7c158297d Fix module editor can not show name with quotes - #1019 2017-06-14 19:12:17 +02:00