Commit Graph

16531 Commits

Author SHA1 Message Date
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
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
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
artica f64498450a Auto-updated build strings. 2018-01-23 00:01:13 +01:00
danielmaya 72aefbd96d Fixed colour link and delete link 2018-01-22 16:17:10 +01:00
vgilc 7e70d22d0a Merge branch '1469-graficas-tip-en-automatic-combined-graphs-y-custom-graphs-pdf-4261-vodat_rev' into 'develop'
fixed minor error combined graph fullscale

See merge request artica/pandorafms!1257
2018-01-22 15:57:03 +01:00
fbsanchez d6feee7d67 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-22 15:51:19 +01:00
fbsanchez b1c70bb580 Modified snmp_remote.pl 2018-01-22 15:50:01 +01:00
daniel 36429616f3 fixed minor error combined graph fullscale 2018-01-22 15:46:23 +01:00
vgilc d471b0889c Merge branch '1572-Descripción-de-interfaces-dell-powerconnect-dev' into 'develop'
Changed explode in wizard snmp interface explorer

See merge request artica/pandorafms!1256
2018-01-22 10:40:03 +01:00
artica dc9e33953e Auto-updated build strings. 2018-01-22 00:01:11 +01:00
artica 6541fe17e8 Auto-updated build strings. 2018-01-21 00:01:12 +01:00
artica d2c97be01c Auto-updated build strings. 2018-01-20 00:01:16 +01:00
fbsanchez b964758d53 Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-19 16:26:40 +01:00
fermin831 d619386cd4 New fixed domain_expiration_date.sh 2018-01-19 14:34:18 +01:00
artica c0c251dd8e Auto-updated build strings. 2018-01-19 00:01:13 +01:00
danielmaya c7c31a308c Changed explode in wizard snmp interface explorer 2018-01-18 13:44:38 +01:00
fbsanchez 7d4e95f3cb Merge branch 'develop' into 1730-missed-enterprise-plugins 2018-01-18 11:35:19 +01:00
artica c96b9aac0d Auto-updated build strings. 2018-01-18 00:01:12 +01:00
artica ff0132e8de Auto-updated build strings. 2018-01-17 00:01:12 +01:00
Junichi Satoh 55d392efc8 Added a new Japanese help and fixed typo. 2018-01-16 14:39:17 +09:00
artica 9d01f98f21 Auto-updated build strings. 2018-01-16 00:01:12 +01:00
vgilc edf46ffb62 Merge branch '1494-Macro-para-agent_name-4736-vodat' into 'develop'
Add _agentname_ and _agentalias_ macros to plugins - #1494

See merge request artica/pandorafms!1253
2018-01-15 13:42:54 +01:00
enriquecd a5a3d6ac64 Add _agentname_ and _agentalias_ macros to plugins - #1494 2018-01-15 11:51:33 +01:00
danielmaya 3a3de49802 Fixed text/html option in alert action 2018-01-15 11:04:53 +01:00