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

7552 Commits

Author SHA1 Message Date
vgilc aaa21d2bd8 Merge branch '1241-adv-config-in-ldap-auth-dev' into 'develop' 
1241 adv config in ldap auth dev

See merge request !853
 2017-10-04 15:49:39 +02:00
vgilc 45c35a1a0f Merge branch '1251-export-data-to-csv-in-graph-container-dev' into 'develop' 
Fixed error in js library and added good export to graph container graphs

See merge request !828
 2017-10-04 14:28:38 +02:00
vgilc 83488e517e Merge branch '1349-Boton-muy-feo-en-el-wizard-de-instalacion-de-pandora' into 'develop' 
Change installer next button style - #1349

See merge request !833
 2017-10-04 14:01:54 +02:00
vgilc 9d4f11113e Merge branch '1283-Imagen-No-data-to-show' into 'develop' 
Fix error showing image when there is no data to show in graphs - #1283

See merge request !831
 2017-10-04 13:46:49 +02:00
vgilc 26da8fe19d Merge branch '1312-merge-errors-in-the-last-package-dev' into 'develop' 
Added lost changes

See merge request !811
 2017-10-04 11:05:06 +02:00
vgilc 4cc3f0d426 Merge branch '1368-Problems-with-empty-networkmaps-dev' into 'develop' 
Fixed id of pandora node

See merge request !873
 2017-10-04 10:37:26 +02:00
vgilc 82f8b333d5 Merge branch '1134-url-routes-analyzer-feature-dev' into 'develop' 
1134 url routes analyzer feature dev

See merge request !870
 2017-10-04 09:42:37 +02:00
artica de8285dc27 Auto-updated build strings. 2017-10-04 00:01:23 +02:00
Arturo Gonzalez 09f73929aa Changed route analyzer styles 2017-10-03 16:40:01 +02:00
Arturo Gonzalez 7cd5d9c3a9 Added new styles to route analyzer 2017-10-03 15:20:35 +02:00
Arturo Gonzalez 65bfedf404 Fixed id of pandora node 2017-10-03 10:32:22 +02:00
artica 7b3a0d49f1 Auto-updated build strings. 2017-10-03 00:01:22 +02:00
Daniel Maya 67a17679e3 Added encryption select in enterprise setup 2017-10-02 15:40:10 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
artica e9b8f01931 Auto-updated build strings. 2017-10-02 00:01:20 +02:00
artica bc48ddc747 Auto-updated build strings. 2017-10-01 00:01:20 +02:00
artica befb1fb196 Auto-updated build strings. 2017-09-30 00:01:23 +02:00
vgilc 3ea66cbae8 Merge branch 'update-japanese-help' into 'develop' 
Updated Japanese help.

See merge request !771
 2017-09-29 08:32:27 +02:00
artica 6d7a9fd648 Auto-updated build strings. 2017-09-29 00:01:25 +02:00
Daniel Maya 7a061edb66 group by id_agent in group events 2017-09-28 16:46:40 +02:00
artica 165087d670 Auto-updated build strings. 2017-09-28 00:01:20 +02:00
artu30 d372d3a93e Merge branch 'develop' into '1241-adv-config-in-ldap-auth-dev' 
# Conflicts:
#   pandora_console/include/auth/mysql.php
 2017-09-27 11:02:15 +02:00
Arturo Gonzalez b09fdce7e3 Added password verification when log in with ldap 2017-09-26 15:41:04 +02:00
daniel 4ec6b4e053 add new select to setup for TIP 2017-09-26 11:53:57 +02:00
artica 5ab5e04630 Auto-updated build strings. 2017-09-26 00:01:25 +02:00
Daniel Maya 237755a84c Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-09-25 15:34:39 +02:00
Daniel Maya f67a4d90ae Dynamic unit in massive edit modules 2017-09-25 14:51:45 +02:00
Arturo Gonzalez cb85cff34f ldap adv conf v3 (good version) 2017-09-25 14:18:40 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
Arturo Gonzalez 89ba75f466 Added ldap adv conf v2 2017-09-25 13:13:11 +02:00
vgilc 3bdd23e2d7 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola2-dev' into 'develop' 
update info of state in events

See merge request !847
 2017-09-25 09:23:58 +02:00
vgilc 851a8082a4 Merge branch '1338-Graficas_TIP_en_informes_open_rev' into 'develop' 
reajust date in flash graphs

See merge request !849
 2017-09-25 08:50:51 +02:00
artica 444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica 3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
daniel 44a6e39f99 reajust date in flash graphs 2017-09-22 15:12:53 +02:00
Daniel Maya 4c4a89ecf1 update info of state in events 2017-09-22 15:01:17 +02:00
Arturo Gonzalez f738fa2fce Added ldap login adv conf v1 2017-09-22 13:54:02 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
enriquecd 00eba72a99 Fix data 64 images in dialog for command_snapshot config token - #1250 2017-09-22 10:56:52 +02:00
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
Arturo Gonzalez 9d09f9a436 LDAP in progress 2017-09-21 18:00:32 +02:00
Arturo Gonzalez 98a05f7850 Added changes to ldap adv config 2017-09-21 15:55:21 +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
Arturo Gonzalez 8d6e6d2161 Added ldap new fields to conf 2017-09-21 13:43:46 +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
enriquecd be0655334d Change installer next button style - #1349 2017-09-20 13:04:36 +02:00
Arturo Gonzalez 526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
enriquecd 3ae202ff15 Fix error showing image when there is no data to show in graphs - #1283 2017-09-20 10:49:52 +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 ae657210f8 Fixed error in js library and added good export to graph container graphs 2017-09-19 17:46:12 +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
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
Arturo Gonzalez 7445ff755f Added lost changes 2017-09-11 16:19:45 +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
Daniel Maya 1a56c78808 Added degree in io_safe_input 2017-09-08 12:39:00 +02:00
enriquecd 74e4ae3f71 Use alias as name with option default tconfig - #1255 2017-09-08 12:11:15 +02:00