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

16503 Commits

Author SHA1 Message Date
artica 3235215547 Auto-updated build strings. 2018-01-31 00:01:14 +01:00
artica 2065207661 Auto-updated build strings. 2018-01-30 00:01:14 +01:00
vgilc e29b8f86bd Merge branch 'add-japanese-help' into 'develop' 
Update Japanese help

See merge request artica/pandorafms!1254
 2018-01-29 17:31:23 +01:00
vgilc 0da39d386b Merge branch '1678-Qr-de-vista-de-agente-que-redireccione-a-vista-escritorio-en-modo-escritorio-del-navegador-movil' into 'develop' 
Redirect to desktop version pandora when scan agent view QR with a mobilephone…

See merge request artica/pandorafms!1165
 2018-01-29 13:38:25 +01:00
vgilc 2af1b628a8 Merge branch '1730-missed-enterprise-plugins' into 'develop' 
Fixed some default values in PluginTools

See merge request artica/pandorafms!1239
 2018-01-29 13:37:11 +01:00
vgilc c9074ecbd3 Merge branch '1745-Mejora-visual-en-el-pop-up-de-ayuda-dev' into 'develop' 
Fixed link to official documentation

See merge request artica/pandorafms!1224
 2018-01-29 13:36:39 +01:00
vgilc 7b20e43141 Merge branch '1746-Mejora-visual-en-el-popup-de-warning-en-el-header-dev' into 'develop' 
Fixed messages in warning popup

See merge request artica/pandorafms!1227
 2018-01-29 13:36:06 +01:00
vgilc b0fc04c8f3 Merge branch '1751-Posición-de-los-agentes-en-el-mapa-de-red-dev' into 'develop' 
Fixed raw_text in networkmap

See merge request artica/pandorafms!1238
 2018-01-29 13:35:20 +01:00
vgilc 2ef8a4905f Merge branch '1601-WUX_bloquea_el_inicio' into 'develop' 
fixed error server WUX

See merge request artica/pandorafms!1146
 2018-01-29 13:34:03 +01:00
vgilc 192fc99bf4 Merge branch '1620-Parametros_que_no_estan_o_sobran_en_el_pandora_server_conf' into 'develop' 
fixed minor error pandora_server.conf

See merge request artica/pandorafms!1148
 2018-01-29 13:32:45 +01:00
vgilc d9825c08b5 Merge branch '1660-WUX-stats-charts-dev' into 'develop' 
Fixed jquery error

See merge request artica/pandorafms!1151
 2018-01-29 13:31:19 +01:00
vgilc 618498dc65 Merge branch '1672-Letrero-de-página-de-inicio-de-sesión-de-la-consola-no-permite-meter-letras-en-minúsuclas' into 'develop' 
Show real case in login page titles - #1672

See merge request artica/pandorafms!1166
 2018-01-29 13:30:45 +01:00
vgilc 2a7bcb4bc2 Merge branch '1673-elemento-group-en-modo-show-statistics-no-muestra-cartel-dev' into 'develop' 
Fixed group status icon

See merge request artica/pandorafms!1178
 2018-01-29 13:30:10 +01:00
vgilc bc6b660592 Merge branch '1674-Sincronizacion-de-agentes-inmediata-con-metaconsola-en-operación-masiva' into 'develop' 
Update metaconsole after agent bulk operations for update - #1674

See merge request artica/pandorafms!1174
 2018-01-29 13:29:40 +01:00
vgilc 61ce7237c3 Merge branch '1688-Error-en-API-al-habilitar-alertas' into 'develop' 
Add new function enable alert by alias - #1688

See merge request artica/pandorafms!1177
 2018-01-29 13:25:54 +01:00
vgilc 2e486ffac0 Merge branch '1727-Gráficas-horizontales-texto' into 'develop' 
Fix hbar grpahs label - #1727

See merge request artica/pandorafms!1246
 2018-01-29 13:25:04 +01:00
vgilc 482204b525 Merge branch '1734-No-se-pueden-ver-opciones-avanzadas-en-módulos-generic_data_string' into 'develop' 
Fix advanced options toggle for data string modules - #1734

See merge request artica/pandorafms!1237
 2018-01-29 13:24:37 +01:00
vgilc dc5840b844 Merge branch '1736-Consola-visual-Previsualización-background-no-carga-imagen-en-meta-dev' into 'develop' 
Fixed background preimage in visual console

See merge request artica/pandorafms!1243
 2018-01-29 13:23:46 +01:00
vgilc d82ce632bd Merge branch '1740-Iconos-de-grupos-aumentan-de-tamaño-en-consola-visuales-de-meta' into 'develop' 
Fix group elements size in editor mode for metaconsole when set to 0px - #1740

See merge request artica/pandorafms!1241
 2018-01-29 13:23:11 +01:00
vgilc ffc9a44f8d Merge branch '1747-Error-Mapas-de-red-Pandora-Open-dev' into 'develop' 
deleted column of nodes in pandora open

See merge request artica/pandorafms!1242
 2018-01-29 13:22:34 +01:00
vgilc 862242bf00 Merge branch '1782-Fallo-en-enlaces-de-nodos-en-mapas-de-red-dev' into 'develop' 
Fixed colour link and delete link

See merge request artica/pandorafms!1258
 2018-01-29 13:19:27 +01:00
vgilc deeb7ac77d Merge branch '1815-SLA_tiempos_en_desconocido' into 'develop' 
Revised: dbuncompress

See merge request artica/pandorafms!1263
 2018-01-29 13:00:33 +01:00
vgilc 9d4521e5e5 Merge branch '1374-Nombre-predeterminado-para-custom-graphs-4597-com1' into 'develop' 
Show graph name in custom graph items for report list - #1374

See merge request artica/pandorafms!1203
 2018-01-29 12:59:22 +01:00
vgilc 94e2e0b908 Merge branch 'fix-module-graph-decimals' into 'develop' 
Resolve: "Fix module graph decimals"

See merge request artica/pandorafms!1121
 2018-01-29 12:58:13 +01:00
vgilc 86a581ec02 Merge branch '1420-Formato-en-footer-y-header-de-PDF-4649-com1' into 'develop' 
Add tinymce buttons to header a footer editor in visual styles - #1420

See merge request artica/pandorafms!1189
 2018-01-29 12:55:49 +01:00
vgilc 5a198404b7 Merge branch '1525-Imagenes-WUX-no-salen-bien-en-histórico-4776-pelayo' into 'develop' 
Fix history data dialog for base 64 images on modules view - #1525

See merge request artica/pandorafms!1107
 2018-01-29 12:55:14 +01:00
vgilc 1558dee350 Merge branch '1634-Static-graphs-siempre-muestran-5-decimales-4908-media' into 'develop' 
Limit static graphs decimal numbers to show in visual console with data…

See merge request artica/pandorafms!1209
 2018-01-29 12:53:53 +01:00
vgilc 717ecb6adc Merge branch '1638-Si-creamos-una-gráfica-combinada-con-un-intervalo-pequeño-sale-vacía-dev' into 'develop' 
Fixed interval when the period is less than resolution in custom graph

See merge request artica/pandorafms!1118
 2018-01-29 12:53:27 +01:00
vgilc c5d778fd14 Merge branch '1650-Public-url-rompe-vista-móvil-si-no-acaba-en-/-dev' into 'develop' 
Added help_tip in public url

See merge request artica/pandorafms!1125
 2018-01-29 12:53:02 +01:00
vgilc 34ccc01c7b Merge branch '1656-Group-recursion-no-funciona-correctamente-en-operaciones-masivas-dev' into 'develop' 
Fixed group recursion in bulk operation

See merge request artica/pandorafms!1133
 2018-01-29 12:52:35 +01:00
vgilc 8ec7d21932 Merge branch '1723-Etiquetas-en-datos-largos-(vista-de-módulos)-dev' into 'develop' 
Fixed tag i in status monitor data

See merge request artica/pandorafms!1228
 2018-01-29 12:51:24 +01:00
vgilc 6703f49607 Merge branch '1756-Añadir-gráfico-en-los-correos-de-alertas-de-módulos-tipo-string-dev' into 'develop' 
Added string graph in mail

See merge request artica/pandorafms!1250
 2018-01-29 12:50:57 +01:00
vgilc 98dc8f0fa5 Merge branch 'ent-1624-extension-chrome-de-eventos-desactualizada' into 'develop' 
Ent 1624 extension chrome de eventos desactualizada

See merge request artica/pandorafms!1152
 2018-01-29 12:50:19 +01:00
vgilc 1b7b17d28f Merge branch '1676-Tags-y-vista-de-alertas' into 'develop' 
Fix tag filter in alert view - #1676

See merge request artica/pandorafms!1171
 2018-01-29 12:48:31 +01:00
vgilc 8f2a29ae3c Merge branch '1738-Problema_en_event.build_query.php_CDE' into 'develop' 
fixed warnings php in log pandora

See merge request artica/pandorafms!1234
 2018-01-29 12:47:19 +01:00
vgilc 3f32fb709d Merge branch '1766-Content-Type-cambia-por-defecto-a-Text/plain-en-las-acciones-de-email-dev' into 'develop' 
Fixed text/html option in alert action

See merge request artica/pandorafms!1252
 2018-01-29 10:19:06 +01:00
artica 2b0688a76c Auto-updated build strings. 2018-01-29 00:01:11 +01:00
artica fd923a5adb Auto-updated build strings. 2018-01-28 00:01:11 +01:00
artica adb127c1c6 Auto-updated build strings. 2018-01-27 00:01:12 +01:00
fbsanchez 658f870265 Minor fixes PluginTools 2018-01-26 15:18:06 +01:00
fbsanchez 8473b589ec Removed invalid comment 2018-01-26 11:48:42 +01:00
fbsanchez e18abda8c0 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-26 11:44:07 +01:00
fbsanchez 41b82861f9 Added pandora_ux to pandora_update_Version 2018-01-26 11:43:21 +01:00
artica 3b88cc46a3 Auto-updated build strings. 2018-01-26 00:01:12 +01:00
fbsanchez 526b5aa29f Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-25 16:24:51 +01:00
vgilc 9ed6b85391 Merge branch '1257-Traducciones-consola-mr' into 'develop' 
Change po,mo,mr and package - #1257

See merge request artica/pandorafms!1264
 2018-01-25 15:56:32 +01:00
enriquecd 2b07a7a8a9 Change po,mo,mr and package - #1257 2018-01-25 15:49:21 +01:00
fbsanchez 34c424953b Revised: dbuncompress 2018-01-25 12:41:44 +01:00
vgilc 23baecc67a Merge branch '1826_Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
Fixed error sql

See merge request artica/pandorafms!1262
 2018-01-25 10:12:58 +01:00
daniel 65615dcf80 Fixed error sql 2018-01-25 10:06:05 +01:00