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

15035 Commits

Author SHA1 Message Date
artica c1545fc802 Auto-updated build strings. 2017-08-21 00:01:11 +02:00
artica f3e5c32c09 Auto-updated build strings. 2017-08-20 00:01:11 +02:00
artica 19f1c3610e Auto-updated build strings. 2017-08-19 00:01:13 +02:00
vgilc e0746e65e8 Merge branch '138-login-items-separate-width-dev' into 'develop' 
Added separation width to login fields

See merge request !632
 2017-08-18 13:18:40 +02:00
vgilc 453838942e Merge branch '122-mensaje-de-error-en-gestion-de-usuarios-ext-3871-v7-0' into 'develop' 
If result param is null not show bad result message when delete,disable user - #122

See merge request !368
 2017-08-18 13:18:08 +02:00
vgilc 7fdfbde6ff Merge branch '133-Bug-en-pop-up-de-activacion-de-licencia-theme-black' into 'develop' 
Change license activation popup color text - #133

See merge request !393
 2017-08-18 13:17:02 +02:00
vgilc a2e0dc06be Merge branch '137-La-busqueda-de-modulos-muestra-los-modulos-disabled-dev' into 'develop' 
Disabled modules no longer appear in the search

See merge request !407
 2017-08-18 13:16:03 +02:00
vgilc be2eee1afa Merge branch '109-modificar-titulo-de-columna-umbrales-en-vista-de-agente' into 'develop' 
Text change warn by thresholds

Closes #109

See merge request !318
 2017-08-18 13:15:27 +02:00
vgilc e76c62ef48 Merge branch '144-problema-con-password-con-espacios-en-version-mobile' into 'develop' 
Fixed problems with pass when this pass containt blank spaces.

See merge request !430
 2017-08-18 13:14:15 +02:00
vgilc 7d1a7103ad Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop' 
Fixed issue to search agent modules in cascade protection

See merge request !717
 2017-08-18 13:05:01 +02:00
vgilc 7ce67ef053 Merge branch '1090-bad-event-custom-field-dev' into 'develop' 
Removed event custom field (id)

See merge request !649
 2017-08-18 13:04:12 +02:00
vgilc c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
allow UNION sql reports

See merge request !704
 2017-08-18 13:01:53 +02:00
vgilc 93c03da3fe Merge branch '1091-Fixed-key-sensitive-search-in-agents-list-dev' into 'develop' 
Fixed search field in agents list

See merge request !650
 2017-08-18 13:01:01 +02:00
vgilc 901a163c84 Merge branch '1108-bad-api-and-cli-request-in-meta-with-events-dev' into 'develop' 
Fixed meta event table in cli and api functions

See merge request !665
 2017-08-18 12:50:19 +02:00
vgilc d858d4840a Merge branch '1111-Columna-email-error-en-vista-de-informes-dev' into 'develop' 
Fixed email column

See merge request !668
 2017-08-18 12:44:26 +02:00
vgilc a5d3f916d7 Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop' 
1005 graficas de alerta con umbrales

See merge request !702
 2017-08-18 12:42:27 +02:00
vgilc 0083d57297 Merge branch '1177-Graficas_con_valores_negativos' into 'develop' 
fixed errors in graphs value negative

See merge request !703
 2017-08-18 12:41:10 +02:00
vgilc ac1a23c577 Merge branch '1150-added-link-to-fictional-nodes-and-redirect-with-dbclick-dev' into 'develop' 
Added new function to redirect with dbclick when fictinal have a map link

See merge request !691
 2017-08-18 12:40:36 +02:00
vgilc 2d153c1074 Merge branch '1130-Nombres-de-agente-en-vista-táctica-dev' into 'develop' 
Extended number of characters allowed

See merge request !680
 2017-08-18 12:38:15 +02:00
vgilc 0a1e11b927 Merge branch '1072-new-macro-to-get-the-module-id-dev' into 'develop' 
Added new macro

See merge request !705
 2017-08-18 12:37:46 +02:00
vgilc 386e48fe58 Merge branch '1155-Fallo-en-conexión-con-LDAP-dev' into 'develop' 
Fixed Connection failure in ldap

See merge request !715
 2017-08-18 12:37:07 +02:00
vgilc 50a7ea3dd9 Merge branch '1045-Insert-data-pierde-información-dev' into 'develop' 
Fixed agent lost in insert data

See merge request !614
 2017-08-18 12:36:06 +02:00
vgilc 6920831d60 Merge branch '1185-Bug_Update_Manager_Online_Pandora_7_Open' into 'develop' 
fixed errors in update manager open

See merge request !714
 2017-08-18 12:35:32 +02:00
vgilc 870be2c4ea Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop' 
Fixed issue with cascade_protection_module

See merge request !720
 2017-08-18 12:34:31 +02:00
artica 3ce15d5814 Auto-updated build strings. 2017-08-18 00:01:12 +02:00
artica f7ecefcc60 Auto-updated build strings. 2017-08-17 00:01:13 +02:00
vgilc 0cc45be6e5 Merge branch '1109-Bug-en-migrate-a-Pandora-FMS-7.0-dev' into 'develop' 
Fixed delimiter

See merge request !735
 2017-08-16 17:24:34 +02:00
Daniel Maya 059dec7cc9 Fixed delimiter 2017-08-16 17:04:21 +02:00
vgilc 0488324a9e Merge branch '1167-Fallo_en_exportacion_a_CSV_de_Custom_Graphs_rev_2' into 'develop' 
fixed minor error

See merge request !734
 2017-08-16 16:36:45 +02:00
daniel 104a1a83b4 fixed minor error 2017-08-16 16:30:44 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
vgilc 75dcbc5431 Merge branch '1173-Campo-label-no-funciona-en-templates-dev' into 'develop' 
Added text line in label help

See merge request !733
 2017-08-16 12:11:11 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
vgilc 139332108d Merge branch '1167-Fallo_en_exportacion_a_CSV_de_Custom_Graphs_rev' into 'develop' 
fixed error export csv custom graph

See merge request !732
 2017-08-16 10:31:07 +02:00
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
artica b0f3a737a9 Auto-updated build strings. 2017-08-16 00:01:15 +02:00
artica a12f0de8b7 Auto-updated build strings. 2017-08-15 00:01:13 +02:00
vgilc bf61f8324f Merge branch '1077-sql-error-in-log4x-data-module-dialog-dev' into 'develop' 
Changed field in sql request

See merge request !654
 2017-08-14 15:30:55 +02:00
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2017-08-14 15:26:54 +02:00
vgilc 395c68450c Merge branch '1206-Problemas-Consola-Visual-4--el-regreso-dev' into 'develop' 
Fixed

See merge request !731
 2017-08-14 14:58:53 +02:00
Daniel Maya 2f8e8703b7 Fixed 2017-08-14 14:53:56 +02:00
vgilc 4813921288 Merge branch '1212-Visualizacion-de-gráficas-con-una-leyenda-que-no-deberia-estar-ahi-dev' into 'develop' 
Xaxisname deleted from xaxes

See merge request !730
 2017-08-14 14:38:32 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
vgilc 47c851be95 Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop' 
Added recover delimiter

See merge request !666
 2017-08-14 12:25:35 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
vgilc 90644f1805 Merge branch '1166-Error_al_crear_modulos_snmp_v2c_a_traves_del_CLI' into 'develop' 
fixed error cli version snmp

See merge request !709
 2017-08-14 12:23:52 +02:00
vgilc 10182b6aa1 Merge branch '1174-Modificar_ayuda_pandora_manage_create_snmp_module' into 'develop' 
fixed minor error

See merge request !711
 2017-08-14 12:21:34 +02:00
vgilc 4d0b360bf8 Merge branch '1112-PopUp-eventos-no-carga-gráfica-de-módulos-con-espacios-dev' into 'develop' 
Fixed urlencode in event popup

See merge request !676
 2017-08-14 12:18:22 +02:00
vgilc f5d161b108 Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop' 
fixed error exportation csv in custom graphs

See merge request !708
 2017-08-14 12:16:47 +02:00
vgilc baf9b6aa5a Merge branch '1173-Campo-label-no-funciona-en-templates-de-informe-en-la-metaconsola-dev' into 'develop' 
Added label in automatic graph

See merge request !706
 2017-08-14 12:13:58 +02:00