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
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
07f5455e28
fixed errors in cron jobs
...
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
2018-12-12 10:46:28 +01:00
5d52e9f9c3
Minor fix
...
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
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
739f0d2690
Minor change
...
Former-commit-id: c16c3356b38cf933403c5fe09c2d11a8d44cd53a
2018-12-12 09:25:09 +01:00
266b12f40a
Auto-updated build strings.
...
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
2018-12-12 00:01:31 +01:00
f6858e2681
Fixed custom graph
...
Former-commit-id: a04d267f990d4628e8b0fc263066c44c3dc4febb
2018-12-11 19:21:43 +01:00
47a547367d
Added a new item to the visual console
...
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
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
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
8088a51035
Fixed audit log
...
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
386eeec7ef
Added group_recursion as tevent_rule column
...
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
2018-12-11 16:07:13 +01:00
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
e3243883f0
Fixed static graph without images creation and update previsualization
...
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +01:00
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
d922b7084c
moved pwrd to enterprise as it is an enterprise feature
...
Former-commit-id: bcb73644fb6d068ac44b1c8c6523467988db441e
2018-12-11 11:19:39 +01:00
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
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
c72d0dd0d4
fixed error status agent in custom field view
...
Former-commit-id: 3516b02e27b28c856b665bc896d076867827f85a
2018-12-11 10:00:05 +01:00
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
663c140b2b
Auto-updated build strings.
...
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
562c5c14ee
Added forgotten include
...
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
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
50b1685e61
Added tagent_secondary_group in functions_reporting
...
Former-commit-id: ba4ac6e64e34810ae1f695840ba1af34bbcdc6c4
2018-12-10 17:34:18 +01:00
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
4d5631d355
add safe output function to strings printed in system audit log
...
Former-commit-id: 383b5885f163d167c8944ad6dc8d66a8b4c35e51
2018-12-10 15:47:25 +01:00
fe749b31ed
Merge branch '3153-Modificar-instalador-de-consola_2' into 'develop'
...
Fixed error in submit - #3153
See merge request artica/pandorafms!2061
Former-commit-id: e0c4d401748beba3ec8afc571e0f35c05c862638
2018-12-10 15:45:44 +01:00
11f07d213b
Merge branch '3229-Error-SQL-en-vista-de-Agente-return-dev' into 'develop'
...
Fixed sql error with empty array in agent view
See merge request artica/pandorafms!2060
Former-commit-id: 897fd643b155185a38c27ede9ad460ed3187e6cc
2018-12-10 15:21:54 +01:00
f98b3e2ea5
Fixed error in submit - #3153
...
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
2018-12-10 15:18:53 +01:00
b9aa474eb3
Fixed sql error with empty array in agent view
...
Former-commit-id: 5a7655d97d28179793a9c029460837568f926128
2018-12-10 15:14:56 +01:00
8419ada94c
Merge branch '2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5' into 'develop'
...
2234 los titulos de los dashboards publicos no se muestran5
See merge request artica/pandorafms!2059
Former-commit-id: 8997749d37dd87519b90ff60df482111e8862fb9
2018-12-10 14:39:24 +01:00
7667c73a38
Deleted constatn
...
Former-commit-id: 880a81ca75686569b16fd362a102364343bc15af
2018-12-10 14:23:23 +01:00
49ce00860f
Deleted constant2
...
Former-commit-id: 7984c71e2f0ae82ade917d19c16788e037b176de
2018-12-10 14:18:56 +01:00
24c42734a2
Merge branch 'develop' into 2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5
...
Former-commit-id: 5a05c4c70812e51258b1cad9ec716fb5c734c23b
2018-12-10 14:16:21 +01:00
33065a3bdb
Deleted constant
...
Former-commit-id: ce3130ce63d9aa75986fc56161aff6964232e49d
2018-12-10 13:49:18 +01:00
c669d35720
Merge branch '2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5' into 'develop'
...
Deleted constant
See merge request artica/pandorafms!2057
Former-commit-id: 905cb2f761a8d93d7c2bf59cefb5a8b8a783b521
2018-12-10 13:45:11 +01:00
3e678f3284
Merge branch '3170-Cambios_custom_fields_view' into 'develop'
...
3170 cambios custom fields view
See merge request artica/pandorafms!2056
Former-commit-id: e1f50b89d6a04b927e8ada9f2899a16c1f7cdf59
2018-12-10 13:44:28 +01:00
61effb1b54
Merge branch 'ent-3158-pandoramanage-does-not-update-the-metaconsole-agent-cache' into 'develop'
...
Force to update the agent cache when an agent is created by server
See merge request artica/pandorafms!2055
Former-commit-id: d22086177dedcce616fad3a55c285cb477c1948d
2018-12-10 13:43:39 +01:00
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
2018-12-10 13:42:29 +01:00
dd1fb00e19
Revert "Removed html entities in the audit views"
...
This reverts commit ad7610d7f1
2018-12-10 13:40:37 +01:00
22cc41dc90
Deleted constant
...
Former-commit-id: a2145df22e136ac546f0368954bbc7b667033162
2018-12-10 13:39:44 +01:00
ffb6b47106
fixed minor error custom field view
...
Former-commit-id: deaa026e2f44273657ff8d76c4f4e212b46c04fe
2018-12-10 13:22:51 +01:00
e2bf9b37ba
Updated help on create_agent
...
Former-commit-id: 7dc4db7bf40be74d93692f8eab7effa299a3ac60
2018-12-10 12:21:32 +01:00
44f9a73a81
Added agent as name parameter in create_agent CLI function
...
Former-commit-id: 1395aed8a79b8e26836ca523d457f939a006f5a1
2018-12-10 12:17:12 +01:00
32f665c761
Force to update the agent cache when an agent is created by server
...
Former-commit-id: 0c00b9b2157e749bb33750a0715e16e91b02003c
2018-12-10 11:15:13 +01:00
9ca56c40ea
Added a new color input and a debug function
...
Former-commit-id: 657724102e35c49465119d2ef75e3363d4d0d878
2018-12-10 09:20:06 +01:00
b0998003a3
Added a new icon
...
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
2018-12-10 09:19:26 +01:00
1fdba79162
Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
...
Former-commit-id: 858d273478e7e6fb985be64bd6041586207e1ac4
2018-12-10 09:18:34 +01:00
b6a673fb7a
fixed error in customs fields view
2018-12-10 09:18:04 +01:00
vgilc
daniel
Alejandro Gallardo Escobar
artica
danielmaya
samucarc
fermin831
fbsanchez
alejandro-campos
tatiana.llorente@artica.es
manuel.montes