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

11729 Commits

Author SHA1 Message Date
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
artica 41956caa5c Auto-updated build strings. 2017-09-14 00:01:20 +02:00
enriquecd 7b2e2fadc6 Let create a group status visual map element without image selected - #1245 2017-09-13 17:07:35 +02:00
vgilc 754697f51c Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop' 
Ent 966 os version en ficheros xml ext 4098 v7 0

See merge request !813
 2017-09-13 12:53:43 +02:00
artica 4cc2a5da0a Auto-updated build strings. 2017-09-13 00:01:21 +02:00
enriquecd 3f6f544dc7 Fix SLA visual map item - #1318 2017-09-12 16:39:31 +02:00
artica 870a59ba57 Auto-updated build strings. 2017-09-12 00:01:21 +02:00
fermin831 89fc3c457a Fixed no os_version on event agent view 2017-09-11 17:54:28 +02:00
vgilc ab3b6838b9 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola-dev' into 'develop' 
added filter by user groups

See merge request !810
 2017-09-11 16:32:04 +02:00
Daniel Maya 975267eff0 added filter by user groups 2017-09-11 13:51:35 +02:00
Enrique Camargo ae987427d7 Merge branch 'develop' into '624-Operaciones-multiples-con-elementos-de-la-consola-visual' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-09-11 10:44:17 +02:00
vgilc 508a594dba Merge branch '1154-Fallo-en-creación-de-paradas-programadas-en-modo-quiet-dev' into 'develop' 
Added modules selection mode

See merge request !804
 2017-09-11 09:53:06 +02:00
vgilc c9a431d2c9 Merge branch '972-added-disabled-agents-to-policy-agents-selects-dev' into 'develop' 
Added disabled option to get ggroup agents function

See merge request !782
 2017-09-11 09:51:39 +02:00
vgilc d5a89ee1f1 Merge branch 'MR-anadir_resumen_de_grupos_como_elemento_de_consola_visual' into 'develop' 
DB changes for visual console group elements - #1245

See merge request !793
 2017-09-11 09:49:21 +02:00
vgilc da0294b872 Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual' into 'develop' 
Add show_statistics option for group item - #1245

See merge request !766
 2017-09-11 09:45:45 +02:00
vgilc da0394cc81 Merge branch '1237-Ampliar_caracteres_para_box_de_comunidad_SNMP_en_operaciones_masivas_v7' into 'develop' 
fixed snmp comunity field

See merge request !783
 2017-09-11 09:44:55 +02:00
vgilc 813825a5be Merge branch '1223-Entidades-pendientes-dev' into 'develop' 
Added degree in io_safe_input

See merge request !805
 2017-09-11 09:44:14 +02:00
vgilc 4096a0f5ff Merge branch '1122-Revision-del-estilo-CSS-de-las-paginas-de-ayuda' into 'develop' 
Change pandora help window style - #1122

See merge request !741
 2017-09-11 09:43:39 +02:00
vgilc df1489e08f Merge branch '1194-Extension-DB-inface-en-panel-de-ultima-actividad' into 'develop' 
Fix dbmanager when insert db activity in activity login info panel - #1194

See merge request !739
 2017-09-11 09:42:56 +02:00
vgilc ae0196f7b5 Merge branch '1169-Pandora-FMS-Aplicación-movil-Error-en-ordenacion-de-eventos' into 'develop' 
Fix bad ordination in mobile pandora events list - #1169

See merge request !746
 2017-09-11 09:41:56 +02:00
vgilc 71e737e059 Merge branch '977-module-data-string-format-dev' into 'develop' 
Added new format to string data

See merge request !786
 2017-09-11 09:40:53 +02:00
vgilc 4457b3d849 Merge branch '1079-interfaces-when-agent-comes-to-satellite-dev' into 'develop' 
Added function to get all interfaces

See merge request !764
 2017-09-11 09:38:52 +02:00
vgilc 6bf85a0789 Merge branch '1070-disable-interface-links-in-fictional-nodes-dev' into 'develop' 
Removed interface link function in fictional nodes

See merge request !644
 2017-09-11 09:35:35 +02:00
vgilc fecd2b14e4 Merge branch '1168-icon-in-agents-know-if-is-in-planned-downtime-dev' into 'develop' 
Added image to planned downtime

See merge request !772
 2017-09-11 09:32:49 +02:00
vgilc ffdafce87b Merge branch '1094-no-filter-by-agent-in-status-monitor-dev' into 'develop' 
Added correct filter name

See merge request !652
 2017-09-11 09:26:40 +02:00
vgilc d7eb182dca Merge branch '1084-Conteo-de-vista-tactica-dev' into 'develop' 
Fixed module counter

See merge request !641
 2017-09-11 09:25:47 +02:00
vgilc 99fa1d0aad Merge branch '1216-error-in-edit-networkmaps-open-dev' into 'develop' 
Fixed combo in editor

See merge request !747
 2017-09-11 09:19:59 +02:00
vgilc 585e7d44ee Merge branch '1170-Pandora-FMS-Aplicación-movil-Error-La-barra-de-histograma' into 'develop' 
Change 24h event histogram function in pandora mobile to same that desktop pandora - #1170

See merge request !745
 2017-09-11 09:12:54 +02:00
artica 291871fae0 Auto-updated build strings. 2017-09-11 00:01:20 +02:00
artica e651f64c85 Auto-updated build strings. 2017-09-10 00:01:18 +02:00
artica cc36e2756f Auto-updated build strings. 2017-09-09 00:01:22 +02:00
daniel 8a7b0a0f79 fixed errors in new macro graph treshold 2017-09-08 13:55:03 +02:00
Daniel Maya 1a56c78808 Added degree in io_safe_input 2017-09-08 12:39:00 +02:00
Daniel Maya 32fa42a378 Added modules selection mode 2017-09-08 12:32:21 +02:00
vgilc 2689213fdf Merge branch '1181-add-short-data-option-to-charts-dev' into 'develop' 
Added option to short data or not

See merge request !785
 2017-09-08 10:29:53 +02:00
vgilc c2a132255c Merge branch '1057-No-muestra-imagenes-PNG-en-el-custom-logo-de-los-informes-OPEN' into 'develop' 
Let use png logo images for reports - #1057

See merge request !625
 2017-09-08 10:13:35 +02:00
vgilc b4f0cf12ae Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop' 
Change pandorin dialog font color with black theme - #1060

See merge request !635
 2017-09-08 10:02:45 +02:00
vgilc 054c13695c Merge branch '1203-Hora-descuadrada-en-caja-de-eventos-del-agente' into 'develop' 
Apply padding to event 24h event history bar for agent view - #1203

See merge request !738
 2017-09-08 10:01:47 +02:00
artica 7f3539ecf0 Auto-updated build strings. 2017-09-08 00:01:19 +02:00
daniel f2f9cc666e boolean graphs 2017-09-07 18:11:42 +02:00
vgilc 191d6bb0d4 Merge branch '1198-errors-in-boolean-chart-fourth-time-dev' into 'develop' 
Added a change to boolean charts

See merge request !799
 2017-09-07 16:34:19 +02:00
vgilc 5f4f397901 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' into 'develop' 
Resolve "Pandora7: Directorio de colecciones en gitlab"

See merge request !798
 2017-09-07 16:33:58 +02:00
Arturo Gonzalez 598b04c2db Added a change to boolean charts 2017-09-07 16:17:41 +02:00
Daniel Maya c8bbe92412 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' of https://192.168.50.5:8081/artica/pandorafms into 125-Gestión-recolección-y-correlación-de-logs-dev 2017-09-07 16:16:16 +02:00
Daniel Maya a66a210db1 Update log report 2017-09-07 16:15:17 +02:00
vgilc 3d2948d7eb Merge branch '1198-errors-in-boolean-chart-third-time-dev' into 'develop' 
Updated module chart code

See merge request !796
 2017-09-07 15:29:29 +02:00
Arturo Gonzalez da117723ef Updated module chart code 2017-09-07 15:19:03 +02:00
Arturo Gonzalez c986e4fad7 Added minor change to boolean charts 2017-09-07 14:45:20 +02:00
enriquecd 8ce6920e44 DB changes for visual console group elements - #1245 2017-09-07 12:11:13 +02:00
Arturo Gonzalez 2fba19d55c Added some changes in boolean charts 2017-09-07 11:14:06 +02:00