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

7452 Commits

Author SHA1 Message Date
vgilc a42e2eae4c Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop' 
fixed minor errors tips

See merge request !842
 2017-09-22 09:30:35 +02:00
vgilc 6bb182bf8f Merge branch '1155-Fallo_en_conexion_con_LDAP_merge_roto_Dani_' into 'develop' 
fixed error bad merge ldap

See merge request !841
 2017-09-22 09:30:29 +02:00
artica c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
daniel 3613d1c1fc fixed minor errors tips 2017-09-21 18:37:57 +02:00
daniel d86d622340 fixed error bad merge ldap 2017-09-21 15:53:45 +02:00
daniel 9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00
artica 581b6cbae2 Auto-updated build strings. 2017-09-21 00:01:28 +02:00
daniel edb2865430 fixed errors in TIP SPARSE 2017-09-20 17:29:17 +02:00
Arturo Gonzalez f5e1410406 Added fix to macros in pdf view 2017-09-20 17:09:50 +02:00
Arturo Gonzalez 3f253b9db4 Added restriction when report comes from template 2017-09-20 15:44:30 +02:00
Arturo Gonzalez 526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
Arturo Gonzalez 36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +02:00
Arturo Gonzalez da763824a9 Added a minor change to test optimization 2017-09-19 10:48:30 +02:00
vgilc 843c190655 Merge branch '1345-corregir_errores_en_graficas_boleanas_de_tip' into 'develop' 
fixed errors in TIP boolean graphs

See merge request !826
 2017-09-19 09:30:56 +02:00
artica 2e802e1b70 Auto-updated build strings. 2017-09-19 00:01:21 +02:00
daniel d54509fd1e fixed errors in TIP boolean graphs 2017-09-18 17:57:43 +02:00
enriquecd e05d0bab25 Compatible with all browsers - #1245 2017-09-18 11:07:59 +02:00
vgilc 4e840651be Merge branch '1217-errors-in-pandora-report-templates-macros-dev' into 'develop' 
1217 errors in pandora report templates macros dev

See merge request !822
 2017-09-18 10:28:54 +02:00
Arturo Gonzalez e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop' 
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
 2017-09-18 10:12:41 +02:00
vgilc bfbee7179d Merge branch 'Problemas_con_full_scale' into 'develop' 
fixed error in full_scale

See merge request !809
 2017-09-18 09:25:10 +02:00
artica 9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00
artica 14cea700ad Auto-updated build strings. 2017-09-17 00:01:19 +02:00
artica d35a88e439 Auto-updated build strings. 2017-09-16 00:01:20 +02:00
Arturo Gonzalez e3d42a878a Added changes to NODE 2017-09-15 13:21:51 +02:00
artica 802a782c9a Auto-updated build strings. 2017-09-15 00:01:21 +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
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 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 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 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 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
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 731e9bf917 fixed error in full_scale 2017-09-08 16:10:31 +02:00
daniel 8a7b0a0f79 fixed errors in new macro graph treshold 2017-09-08 13:55:03 +02:00