Commit Graph

19413 Commits

Author SHA1 Message Date
artica 7af8f01b59 Auto-updated build strings.
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +01:00
samucarc 632d67095b List alert actions in nodes with CLI and API
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
2018-12-14 17:20:46 +01:00
vgilc f2f88579fa Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Added a pending translation

See merge request artica/pandorafms!2083

Former-commit-id: 2ea6499b990e08750210593f2b4882044da392ed
2018-12-14 10:21:40 +01:00
artica b26d13db54 Auto-updated build strings.
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
2018-12-14 00:01:32 +01:00
vgilc 87c56ee5fd Merge branch '3177-Send_custom_report' into 'develop'
3177 send custom report

See merge request artica/pandorafms!2084

Former-commit-id: 7272783ca9a571ce7bfb37ab1918e147945167e5
2018-12-13 17:41:45 +01:00
daniel b06790cc1a Merge remote-tracking branch 'origin/develop' into 3177-Send_custom_report
Former-commit-id: 3bb953eb2b06d3c827093a0648c722c5281d73d5
2018-12-13 17:24:10 +01:00
daniel 807f7a0b74 fixed minor error
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
2018-12-13 17:24:01 +01:00
Alejandro Gallardo Escobar d76612b247 Minor fix
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +01:00
Alejandro Gallardo Escobar d8285c0ca2 Added a pending translation
Former-commit-id: 6272217de4eb47fe70eac214bf50b34da6aa20bb
2018-12-13 16:49:31 +01:00
vgilc 6839559eb5 Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Error fixes and metaconsole support for the color cloud item of the VC

See merge request artica/pandorafms!2082

Former-commit-id: 445dbc16ce84f22ffb1d379c8539b7ec35c9e478
2018-12-13 15:42:48 +01:00
Alejandro Gallardo Escobar 06a68d01be Error fixes and metaconsole support for the color cloud item of the VC
Former-commit-id: 01b0045b76c41dc2c0f3145631fbd0beae3b16df
2018-12-13 15:36:01 +01:00
vgilc 08c8971434 Merge branch '2658_Operaciones_masicas_sobre_politicas_3_open' into 'develop'
Fixed

See merge request artica/pandorafms!2081

Former-commit-id: ef9889af2975b98bde83d84217ccccab1d458af0
2018-12-13 15:19:25 +01:00
samucarc 6b940d07d5 Fixed
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
vgilc e84611022b Merge branch '3177-Send_custom_report' into 'develop'
fixed error metaconsole template send template

See merge request artica/pandorafms!2080

Former-commit-id: 7ed6111afafbd1537d9ac9d70096b9cfb2a16336
2018-12-13 12:56:45 +01:00
daniel a76895f20e fixed error metaconsole template send template
Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14
2018-12-13 12:47:22 +01:00
artica 3d24bc264e Updated version and build strings.
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
2018-12-13 11:14:24 +01:00
vgilc efdfd7c3f4 Merge branch '2658_Operaciones_masicas_sobre_politicas_2_open' into 'develop'
Fixed minor error

See merge request artica/pandorafms!2079

Former-commit-id: 3eaab74701477c29e800f25eca6b163b7416b3db
2018-12-13 10:06:53 +01:00
artica 0648bf169c Auto-updated build strings.
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
2018-12-13 00:01:36 +01:00
samucarc eab744f65d Fixed minor error
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
vgilc 1b4cd37d5f Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Add the Color Cloud item to the Visual Console

See merge request artica/pandorafms!2075

Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
2018-12-12 17:43:39 +01:00
daniel 358532c4a8 fixed autocombined report metaconsole
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
2018-12-12 16:13:31 +01:00
vgilc ca414d30b6 Merge branch '3237-Al_ejecutarse_una_tarea_programada_del_usuario_las_graficas_dan_error_de_acceso' into 'develop'
fixed errors in cron jobs

See merge request artica/pandorafms!2074

Former-commit-id: d36e73c8393b89c944e8d33fee61b5d07666069e
2018-12-12 10:52:27 +01:00
daniel 07f5455e28 fixed errors in cron jobs
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
2018-12-12 10:46:28 +01:00
Alejandro Gallardo Escobar 5d52e9f9c3 Minor fix
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
vgilc ead4c71f1c Merge branch '3056-Error-en-templates-wizard-de-informes-en-meta-return-dev' into 'develop'
Fixed custom graph

See merge request artica/pandorafms!2073

Former-commit-id: ec91783c18c5dc5d6c41476fb55d8e7909efb51a
2018-12-12 09:28:50 +01:00
Alejandro Gallardo Escobar 739f0d2690 Minor change
Former-commit-id: c16c3356b38cf933403c5fe09c2d11a8d44cd53a
2018-12-12 09:25:09 +01:00
artica 266b12f40a Auto-updated build strings.
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
2018-12-12 00:01:31 +01:00
danielmaya f6858e2681 Fixed custom graph
Former-commit-id: a04d267f990d4628e8b0fc263066c44c3dc4febb
2018-12-11 19:21:43 +01:00
Alejandro Gallardo Escobar 47a547367d Added a new item to the visual console
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
vgilc 328013140c Merge branch 'ent-2531-6174-recursividad-en-los-grupos-para-lanzar-alertas-de-eventos-2' into 'develop'
Added group_recursion as tevent_rule column

See merge request artica/pandorafms!2071

Former-commit-id: 8486d9250866bf44a140ef0b2ae664d19d6d3a6f
2018-12-11 17:53:38 +01:00
vgilc 28a03f588d Merge branch '2877_Mejora_audit_log_2' into 'develop'
Fixed audit log

See merge request artica/pandorafms!2072

Former-commit-id: eb4fc2639777cbd43a4749d427923c0d5e53e021
2018-12-11 17:48:55 +01:00
samucarc 8088a51035 Fixed audit log
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
fermin831 386eeec7ef Added group_recursion as tevent_rule column
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
2018-12-11 16:07:13 +01:00
vgilc 5fd4cd346a Merge branch 'ent-2886-consolas-visuales-static-graphs-en-metaconsola-carrefour-2' into 'develop'
Fixed static graph without images creation and update previsualization

See merge request artica/pandorafms!2068

Former-commit-id: 1af0b86541aa191b15b7595e3a636fddd206944a
2018-12-11 15:00:47 +01:00
samucarc 7f99a8f9f4 List and synchronize group of modules of the meta console with CLI
Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a
2018-12-11 14:43:27 +01:00
fermin831 e3243883f0 Fixed static graph without images creation and update previsualization
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +01:00
vgilc 67fb5fa152 Merge branch 'lab/selenium' into 'develop'
moved pwrd to enterprise as it is an enterprise feature

See merge request artica/pandorafms!2067

Former-commit-id: b811f747e06c0aa177638252329e95a6707386a7
2018-12-11 11:47:02 +01:00
fbsanchez d922b7084c moved pwrd to enterprise as it is an enterprise feature
Former-commit-id: bcb73644fb6d068ac44b1c8c6523467988db441e
2018-12-11 11:19:39 +01:00
vgilc 9fdd46a823 Merge branch '3170-Cambios_custom_fields_view' into 'develop'
3170 cambios custom fields view

See merge request artica/pandorafms!2065

Former-commit-id: aaffbc7b35edb736301e579798f9a6019ca8836d
2018-12-11 10:08:39 +01:00
daniel 0fd61cb31e Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
Former-commit-id: eeb7679e966ce7ed9e1dfe925d64dbbe21a2a752
2018-12-11 10:00:23 +01:00
daniel c72d0dd0d4 fixed error status agent in custom field view
Former-commit-id: 3516b02e27b28c856b665bc896d076867827f85a
2018-12-11 10:00:05 +01:00
vgilc 3914256352 Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm-2' into 'develop'
Added forgotten include

See merge request artica/pandorafms!2064

Former-commit-id: fc3701c7da6effeea69ed28b887212f72d3cc809
2018-12-11 08:51:19 +01:00
artica 663c140b2b Auto-updated build strings.
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
fermin831 562c5c14ee Added forgotten include
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
vgilc 51df84c981 Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-return-2-dev' into 'develop'
Added tagent_secondary_group in functions_reporting

See merge request artica/pandorafms!2063

Former-commit-id: b4d8339957d37c16d5e404299ad85acaa3298d01
2018-12-10 17:42:23 +01:00
danielmaya 50b1685e61 Added tagent_secondary_group in functions_reporting
Former-commit-id: ba4ac6e64e34810ae1f695840ba1af34bbcdc6c4
2018-12-10 17:34:18 +01:00
vgilc 79ce629b30 Merge branch '3228-Vulnerabilidad' into 'develop'
3228 vulnerabilidad

See merge request artica/pandorafms!2062

Former-commit-id: 10c836e36c74c39ce40af8b4cc8547ea81850898
2018-12-10 16:19:37 +01:00
samucarc 484d79d974 Fixed synch error
Former-commit-id: 9b370b64fd24302f76733ca84792d0a57418d688
2018-12-10 16:06:25 +01:00
samucarc 3a80a0467b synchronize group of modules from the meta console
Former-commit-id: 172cd23a0f0f2fa12ad4d37893cae6d22951ee54
2018-12-10 15:55:09 +01:00
alejandro-campos 4d5631d355 add safe output function to strings printed in system audit log
Former-commit-id: 383b5885f163d167c8944ad6dc8d66a8b4c35e51
2018-12-10 15:47:25 +01:00