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

16668 Commits

Author SHA1 Message Date
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
enriquecd 190425ce5d Insert filter type dataa module - #1748 2018-01-29 11:47:26 +01:00
enriquecd b4ac21f969 Change insert data module - #1748 2018-01-29 11:46:20 +01:00
enriquecd b208651bb0 Change module data insert - #1748 2018-01-29 11:44:08 +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
enriquecd 1918520ede Delete comments - #1748 2018-01-29 09:59:12 +01:00
enriquecd 34b6f3026e Fix min warning and critical on creating modules - #1748 2018-01-29 09:56:58 +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
enriquecd ca63112653 Delete comments - #1748 2018-01-26 14:46:56 +01:00
enriquecd a348efc62a Merge branch 'clusters' of https://192.168.50.5:8081/artica/pandorafms into clusters 2018-01-26 14:45:34 +01:00
enriquecd 7c71b83b9a Event bar, module list in view, change builder data - #1748 2018-01-26 14:43:23 +01:00
Ramon Novoa 94a44c9555 Add support for cluster monitoring modules (enterprise). 
Ref pandora_enterprise#1748.
 2018-01-26 13:10:32 +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
enriquecd b57606610c Add min warning and critical data in module creation - #1748 2018-01-26 10:59:05 +01:00
artica 3b88cc46a3 Auto-updated build strings. 2018-01-26 00:01:12 +01:00
enriquecd 77fc16b690 Inprove view and fix wizard - #1748 2018-01-25 20:01:03 +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
enriquecd 9258d00051 Inprove cluster view, and change fields to insert in creation cluster modules - #1748 2018-01-25 15:40:39 +01:00
enriquecd 0808b2bf07 Cluster view, change creation and delete agent module method - #1748 2018-01-25 13:46:45 +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
enriquecd c14e68e0e8 Inprove wizard, change modules update - #1748 2018-01-24 19:39:00 +01:00
vgilc d1a809f9c8 Merge branch '1826-sentencia-union-restringida-en-informes-sql-ext-4134' into 'develop' 
Reapplied #1000 solution

See merge request artica/pandorafms!1261
 2018-01-24 17:40:04 +01:00
fbsanchez 2e1ab72a21 Reapplied #1000 solution 2018-01-24 17:28:00 +01:00
vgilc 14713e30b8 Merge branch '1765-Colecciones-no-se-despliegan-con-la-v717-del-agente-dev' into 'develop' 
Fixed issue in check_collections

See merge request artica/pandorafms!1260
 2018-01-24 16:28:14 +01:00
danielmaya 96e2f08fa5 Fixed issue in check_collections 2018-01-24 16:20:49 +01:00
enriquecd 4358f37e07 Delete clusters, agents and modules - #1748 2018-01-24 16:15:53 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
vgilc 8af95af6d5 Merge branch 'default-mobile-page' into 'develop' 
[Pandora Console > Mobile] Redirect to the required page after login

See merge request artica/pandorafms!1259
 2018-01-24 14:19:47 +01:00
Alejandro Gallardo Escobar 85411c8948 [Pandora Console > Mobile] Redirect to the required page after login 2018-01-24 14:13:13 +01:00
artica e6aa3de997 Auto-updated build strings. 2018-01-24 00:01:12 +01:00
enriquecd 5dbf0eabbd Fix wizard, no show cluster agents in wizard, and preview - #1748 2018-01-23 19:33:48 +01:00