Commit Graph

14900 Commits

Author SHA1 Message Date
samucarc 5c4ad3e845 Merge branch 'develop' into 3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo
Conflicts:
	pandora_console/include/functions_reporting.php

Former-commit-id: b379a4c9d87c3dc7404ccde8ee9a279138f73e3b
2018-12-19 19:45:11 +01:00
alejandro-campos a1ba6fdf07 Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
2018-12-19 19:15:43 +01:00
artica 8a6033e002 Auto-updated build strings.
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
daniel 73d429ff67 fixed error migratesql
Former-commit-id: dba8e3108d2160f51aee058735a7822fd722dddb
2018-12-18 12:52:40 +01:00
alejandro-campos ccb4778217 implemented api functions to create/update/delete/list event filters
Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180
2018-12-17 18:18:17 +01:00
samucarc a9d3d81757 Fixed api function
Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc
2018-12-17 17:56:01 +01:00
samucarc 58289e73bc Added new functionality for CLI to delete policy agents.
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
fbsanchez 6d69ffc955 force suse spec to php7
Former-commit-id: 90f4142b7b1a95f8230ccba50fa4a914dc0ef55c
2018-12-17 17:20:33 +01:00
tatiana.llorente@artica.es 814c89a9a9 Removed if localhost - #3276
Former-commit-id: 67de83efe6a6c7aa4458beb226091df0d6ec21e7
2018-12-17 14:48:16 +01:00
daniel 225635a774 fixed errors in availability reports
Former-commit-id: 0783d9b68bf5f3373579db9f0b09e7506d95ea84
2018-12-17 13:20:57 +01:00
danielmaya b530447474 Added token metaconsole_deploy_inventory_plugin in functions_config
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
daniel 84a0f227b9 fixed error template availability
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
artica 7f9ee21b4b Auto-updated build strings.
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00
artica e1bce89923 Auto-updated build strings.
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
2018-12-16 00:01:25 +01:00
artica 7af8f01b59 Auto-updated build strings.
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +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
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
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
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
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
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
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
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
vgilc 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
tatiana.llorente@artica.es f98b3e2ea5 Fixed error in submit - #3153
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
2018-12-10 15:18:53 +01:00
danielmaya b9aa474eb3 Fixed sql error with empty array in agent view
Former-commit-id: 5a7655d97d28179793a9c029460837568f926128
2018-12-10 15:14:56 +01:00
manuel.montes 7667c73a38 Deleted constatn
Former-commit-id: 880a81ca75686569b16fd362a102364343bc15af
2018-12-10 14:23:23 +01:00
manuel.montes 49ce00860f Deleted constant2
Former-commit-id: 7984c71e2f0ae82ade917d19c16788e037b176de
2018-12-10 14:18:56 +01:00
manuel.montes 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
manuel.montes 33065a3bdb Deleted constant
Former-commit-id: ce3130ce63d9aa75986fc56161aff6964232e49d
2018-12-10 13:49:18 +01:00
vgilc 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
alejandro-campos a2909db631 Revert "Eliminadas entidades html de vista de auditoria"
This reverts commit 530017a79d.


Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
2018-12-10 13:42:29 +01:00
alejandro-campos dd1fb00e19 Revert "Removed html entities in the audit views"
This reverts commit ad7610d7f1.


Former-commit-id: a2b1fb7e9f6032cc255abb42e8ef0d65efc877b6
2018-12-10 13:40:37 +01:00
manuel.montes 22cc41dc90 Deleted constant
Former-commit-id: a2145df22e136ac546f0368954bbc7b667033162
2018-12-10 13:39:44 +01:00
daniel ffb6b47106 fixed minor error custom field view
Former-commit-id: deaa026e2f44273657ff8d76c4f4e212b46c04fe
2018-12-10 13:22:51 +01:00
Alejandro Gallardo Escobar 9ca56c40ea Added a new color input and a debug function
Former-commit-id: 657724102e35c49465119d2ef75e3363d4d0d878
2018-12-10 09:20:06 +01:00
Alejandro Gallardo Escobar b0998003a3 Added a new icon
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
2018-12-10 09:19:26 +01:00
daniel 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
daniel b6a673fb7a fixed error in customs fields view 2018-12-10 09:18:04 +01:00
artica 7e40392740 Auto-updated build strings.
Former-commit-id: b0e915bad1ff00a9c5c75276dd1234c97ea3319f
2018-12-10 00:01:25 +01:00
artica 52520f151d Auto-updated build strings.
Former-commit-id: 77fc145ae77c789a925853444723f45c6f43136a
2018-12-09 00:01:27 +01:00
artica 9d65e6b27e Auto-updated build strings.
Former-commit-id: 880eb1f55439b6ab5c4f0f86329377ff80bc2822
2018-12-08 00:01:28 +01:00
samucarc 2bde6ac6ce Create module group API
Former-commit-id: a2da223ae925935bcc449ee151597fd035b453e2
2018-12-07 15:36:13 +01:00
vgilc f42cda1a41 Merge branch '2568-Succesful-action' into 'develop'
update translation strings

See merge request artica/pandorafms!2051

Former-commit-id: de7e68c1f587a4c708d3a0ae64c6643d66b756b4
2018-12-07 13:52:26 +01:00
alejandro-campos aae40d03a7 update translation strings
Former-commit-id: cd4ef67b08fea6bc20551b26aaa6a852869541f4
2018-12-07 13:44:48 +01:00
vgilc 66f3886193 Merge branch '3229-Error-SQL-en-vista-de-Agente-dev' into 'develop'
Fixed sql error with secondary groups in agent view

See merge request artica/pandorafms!2050

Former-commit-id: 3a3a979c6e45ec7ee9fed078fa458198ef021708
2018-12-07 11:46:31 +01:00
danielmaya 05a06146ef Fixed sql error with secondary groups in agent view
Former-commit-id: 45ddc8329c0ca417c8499cf54d3526acd28eae0a
2018-12-07 11:37:23 +01:00
danielmaya b155b06ae9 Fixed issue with secondary group
Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc
2018-12-07 11:20:15 +01:00
artica e472612597 Auto-updated build strings.
Former-commit-id: 8c3920b9c6a9f85574a5a3ad243b0a459c2a81ab
2018-12-07 00:01:28 +01:00
artica 7d3b5664df Auto-updated build strings.
Former-commit-id: 9536a5de43f0a3c635f058aa493d8bec3bf5d073
2018-12-06 00:01:34 +01:00
vgilc a49d3bbe0e Merge branch '2722-Labels-en-Visual-Console-2' into 'develop'
fix visual console's percentile item: label color not showing and removed label from view menu

See merge request artica/pandorafms!2048

Former-commit-id: f062ddec704f9f1a3b7c356d748f68efa4703a4e
2018-12-05 17:48:07 +01:00
alejandro-campos 0af861f5b9 fix visual console's percentile item: label color not showing and removed label from view menu
Former-commit-id: a19e1307b326a60bfef6441a7af0c7be2520ac6a
2018-12-05 16:25:46 +01:00
manuel.montes 5599c3bd85 Ordered titles in dashboard2
Former-commit-id: c0074389cfc8835a1b9596705640abafb363ca9a
2018-12-05 14:09:10 +01:00
vgilc 1526aa6eee Merge branch '2501-Crear-SO-con-la-API-2' into 'develop'
added success and error messages to api functions api_set_create_os and api_set_update_os

See merge request artica/pandorafms!2043

Former-commit-id: aaa52d060a7e61f1ed3bb3530c5b452db1c0def6
2018-12-05 08:34:56 +01:00
vgilc ceeb90b3ac Merge branch 'ent-2583-open-networkmaps-zoom-and-lines' into 'develop'
Correcciones en los mapas de red

See merge request artica/pandorafms!2044

Former-commit-id: 75d6fd9576486344e30a7168068014cd739eb26c
2018-12-05 08:34:33 +01:00
vgilc bc255c09e8 Merge branch '2893-Error-configuración-personalizada-de-eventos_2' into 'develop'
Changed funciton size by length in jquery - #2893

See merge request artica/pandorafms!2041

Former-commit-id: d4b07122bd7b390f77edc4c746c966608aab1353
2018-12-05 08:34:11 +01:00
vgilc ea1eea5446 Merge branch '3153-Modificar-instalador-de-consola' into 'develop'
Show popup before drop database - #3153

See merge request artica/pandorafms!2042
2018-12-05 08:33:12 +01:00
vgilc 99ac3e5748 Merge branch '3207-6970-update-manager-offline-no-funciona-v729' into 'develop'
Added debian dependency

See merge request artica/pandorafms!2046
2018-12-05 08:32:52 +01:00
artica fe47a9c07e Auto-updated build strings. 2018-12-05 00:01:38 +01:00
fbsanchez 6a50366aea Added debian dependency 2018-12-04 18:46:45 +01:00
Alejandro Gallardo Escobar 3c317c182d Default value given to a textPath's startOffet attribute to fix an error 2018-12-04 16:42:19 +01:00
Alejandro Gallardo Escobar f81cbed374 Fixed an error which caused the networkmap elements to not have lines 2018-12-04 16:22:35 +01:00
alejandro-campos 795620f90f added success and error messages to api functions api_set_create_os and api_set_update_os 2018-12-04 15:55:39 +01:00
tatiana.llorente@artica.es 2cb494bfe7 Show popup before drop database - #3153 2018-12-04 15:41:36 +01:00
tatiana.llorente@artica.es 94c6144653 Changed funciton size by length in jquery - #2893 2018-12-04 15:08:17 +01:00
daniel df3d142baf fixed minor error availability graph print to pdf 2018-12-04 13:00:51 +01:00
vgilc daa928adb4 Merge branch '2029-Error-en-el-sumatorio-de-informes' into 'develop'
fixed bug in custom report's summatory

See merge request artica/pandorafms!2038
2018-12-04 12:21:47 +01:00
alejandro-campos 6f7ab8b435 fixed custom report's summatory in case module is uncompressed 2018-12-04 12:15:42 +01:00
alejandro-campos ef28abc460 fixed bug in custom report's summatory 2018-12-04 11:55:52 +01:00
fermin831 4aa21a86d8 Fixed profile_delete_profile_and_clean_users to not fail when a profile is not assigned to an user 2018-12-04 11:36:18 +01:00
vgilc 973bd5f98c Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop'
3190 bugarro en informe servicios sla

See merge request artica/pandorafms!2036
2018-12-04 11:07:26 +01:00
daniel 05e94ece90 Merge remote-tracking branch 'origin/develop' into 3190-Bugarro_en_informe_servicios_SLA 2018-12-04 10:20:09 +01:00
daniel c63be5b4cc fixed error print pdf chart slice bars 2018-12-04 10:19:26 +01:00
vgilc 1e9be8d161 Merge branch '3170-Cambios_custom_fields_view' into 'develop'
new fields form custom field view

See merge request artica/pandorafms!2030
2018-12-04 10:17:03 +01:00
daniel 67bd22fed3 Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view 2018-12-04 09:39:08 +01:00
daniel 222da4ee40 group filter custom field view 2018-12-04 09:36:48 +01:00
manuel.montes d9749aad03 Fixed bug in agent detail filter 2018-12-04 09:17:34 +01:00
vgilc 426128bb51 Merge branch '3207-6970-update-manager-offline-no-funciona-v729' into 'develop'
3207 6970 update manager offline no funciona v729

See merge request artica/pandorafms!2033
2018-12-04 08:21:13 +01:00
vgilc abdd33949d Merge branch '2877_Mejora_audit_log' into 'develop'
Fixed Audit log in profiles, collections and policies

See merge request artica/pandorafms!1876
2018-12-04 08:15:42 +01:00
artica 500601c67f Auto-updated build strings. 2018-12-04 00:01:28 +01:00
samucarc 34986a5477 Merge branch 'develop' into 2877_Mejora_audit_log
# Conflicts:
#	pandora_console/godmode/users/profile_list.php
2018-12-03 18:57:04 +01:00
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
fbsanchez e5a658edf9 Merge remote-tracking branch 'origin/develop' into 3207-6970-update-manager-offline-no-funciona-v729 2018-12-03 17:02:15 +01:00
fbsanchez 4157a85a24 added php-pecl-zip to centos spec, fixed dependency on suse rpm - old php5 2018-12-03 17:02:09 +01:00
Alejandro Gallardo Escobar a4f2a65e3a Fixed the initial zoom and center of the networkmaps 2018-12-03 16:12:43 +01:00
vgilc 4fa3f967f6 Merge branch '2888-Error-links-en-Show-link-to-public-dashboard_2' into 'develop'
Changed url for widgets in public dashboard Part2 - #2888

See merge request artica/pandorafms!2032
2018-12-03 15:50:20 +01:00
vgilc d9e3b58aee Merge branch '2893-Error-configuración-personalizada-de-eventos' into 'develop'
Changed timestamp value by default - #2893

See merge request artica/pandorafms!1881
2018-12-03 15:36:10 +01:00
daniel 0c27534ca3 fixed refresh status agents 2018-12-03 12:53:41 +01:00
tatiana.llorente@artica.es 749f443e9e Changed url for widgets in public dashboard Part2 - #2888 2018-12-03 12:08:39 +01:00
Alejandro Gallardo Escobar 027043f9f3 Revert "included file required by update_manager_get_current_package function in footer file"
This reverts commit 94493e18ce.
2018-12-03 11:54:17 +01:00
daniel 01a9621eb5 Custom fields view add new filters 2018-12-03 11:36:34 +01:00
vgilc eafdb87dc0 Merge branch '2756-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-2' into 'develop'
Add get_group_id_by_name and get_timezone to api functions - #2756

See merge request artica/pandorafms!1836
2018-12-03 09:10:14 +01:00
artica 76db57a8b6 Auto-updated build strings. 2018-12-03 00:01:26 +01:00
artica b5ac333dd4 Auto-updated build strings. 2018-12-02 00:01:27 +01:00
artica f18c7cfc08 Auto-updated build strings. 2018-12-01 00:01:45 +01:00
enriquecd 15c03217db Merge branch 'develop' into 2756-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-2
Conflicts:
	pandora_console/include/functions_api.php
2018-11-30 15:04:27 +01:00
daniel c128f750e1 new fields form custom field view 2018-11-30 13:46:29 +01:00
vgilc f53dbea234 Merge branch '1804-Imagen-para-no-data' into 'develop'
Added text for nodata in graph and resized image - #1804

See merge request artica/pandorafms!1838
2018-11-30 13:38:07 +01:00
vgilc 7d52afff16 Merge branch '1886-Bug-Aviso-Enterprise-Network-Component-Open' into 'develop'
Changed the value from modal to false - #1886

See merge request artica/pandorafms!1828
2018-11-30 13:37:44 +01:00
vgilc 33603a79d8 Merge branch '2176-SNMP-Wizard-Nombres-de-modulos-con-entities2' into 'develop'
Fixed bug in SNMP Wizard

See merge request artica/pandorafms!1929
2018-11-30 13:37:07 +01:00
vgilc b45ad25b56 Merge branch '2658_Operaciones_masicas_sobre_politicas' into 'develop'
Fixed centralized management in nodes

See merge request artica/pandorafms!1870
2018-11-30 13:28:58 +01:00
vgilc 111ae09928 Merge branch '2722-Labels-en-visual-console' into 'develop'
fixed labels not showing for percentile item in visual console builder

See merge request artica/pandorafms!2019
2018-11-30 13:27:15 +01:00
vgilc 0014c4df9e Merge branch '2849-Cambio-de-hora' into 'develop'
Changed date in footer - #2849

See merge request artica/pandorafms!1847
2018-11-30 13:22:25 +01:00
vgilc 71a4a6bf77 Merge branch '2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail' into 'develop'
Fixed bug in agent status filter

See merge request artica/pandorafms!1829
2018-11-30 13:21:48 +01:00
vgilc 3f02447271 Merge branch 'ent-2886-consolas-visuales-static-graphs-en-metaconsola-carrefour' into 'develop'
Removed unused code (meta static graphs)

See merge request artica/pandorafms!1953
2018-11-30 13:13:58 +01:00
vgilc 01cf7d8081 Merge branch '2888-Error-links-en-Show-link-to-public-dashboard' into 'develop'
Changed url for widgets in public dashboard - #2888

See merge request artica/pandorafms!1859
2018-11-30 13:12:30 +01:00
vgilc 472995ce63 Merge branch '2889-PHP-Fatal-error-al-pulsar-ayudas' into 'develop'
included file required by update_manager_get_current_package function in footer file

See merge request artica/pandorafms!1852
2018-11-30 13:12:04 +01:00
vgilc d2c048b2dc Merge branch '2890-Texto-en-Active-incident-on-this-agent' into 'develop'
Added css rule for links in the th tables with databox class- #2890

See merge request artica/pandorafms!1844
2018-11-30 13:11:45 +01:00
vgilc 29e288301d Merge branch '2904-Tip-en-Consola-Visual-Show-on-top' into 'develop'
Tip added - #2904

See merge request artica/pandorafms!1883
2018-11-30 13:10:01 +01:00
vgilc 5754674212 Merge branch '2906-TIP-para-Time-autorefresh-de-Edit-my-user' into 'develop'
Tip added - #2906

See merge request artica/pandorafms!1882
2018-11-30 13:09:34 +01:00
vgilc bf66319d90 Merge branch '2907-TIP-para-Query-History-DataBase' into 'develop'
Tip added - #2907

See merge request artica/pandorafms!1884
2018-11-30 13:09:15 +01:00
vgilc 14d683b003 Merge branch '2917-Error-al-cambiar-de-página-en-eventos-agrupados-por-agente' into 'develop'
Changed url - #2917

See merge request artica/pandorafms!1869
2018-11-30 13:08:53 +01:00
vgilc b97a9e2989 Merge branch '2927-Error-en-vista-de-alertas-lanzadas' into 'develop'
Fixed bug in alert details

See merge request artica/pandorafms!1887
2018-11-30 13:07:41 +01:00
vgilc b88e584e85 Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-dev' into 'develop'
Added check of tags in report wizard

See merge request artica/pandorafms!2007
2018-11-30 13:07:22 +01:00
vgilc 5a3911d185 Merge branch '2939-Bug-en-la-vista-de-graficas-de-un-agente' into 'develop'
Fixed bug in agent graph view

See merge request artica/pandorafms!1955
2018-11-30 13:07:03 +01:00
vgilc 196a37ce05 Merge branch 'ent-2995-graficas' into 'develop'
Fixed no data to show in not init modules with TIP graphs

See merge request artica/pandorafms!1963
2018-11-30 13:06:17 +01:00
vgilc ed615a11d0 Merge branch '3056-Error-en-templates-wizard-de-informes-en-meta-dev' into 'develop'
Fixed Automatic combined Graph in metaconsole

See merge request artica/pandorafms!2021
2018-11-30 13:05:30 +01:00
vgilc 48c83430ec Merge branch '3071_Fallo_en_mapa_GIS' into 'develop'
Fixed error in agent table in GIS map

See merge request artica/pandorafms!1970
2018-11-30 13:05:10 +01:00
vgilc 4bdc7d5303 Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop'
fixed errors in visual console

See merge request artica/pandorafms!2026
2018-11-30 13:04:31 +01:00
vgilc 1d4dbbdcc8 Merge branch '3100-Error_500_si_descargamos_un_archivo_teniendo_configurado_LDAP' into 'develop'
fixed error ldap

See merge request artica/pandorafms!1994
2018-11-30 12:52:20 +01:00
vgilc b916bdbe3c Merge branch 'exit-after-location-header-fix' into 'develop'
Added an exit after every declared Location header

See merge request artica/pandorafms!1988
2018-11-30 12:51:59 +01:00
vgilc 654f3a5021 Merge branch '3130-Visualizacion-erronea-columna-eventos' into 'develop'
modified event list visualization

See merge request artica/pandorafms!2018
2018-11-30 12:51:22 +01:00
vgilc dcacd53d5b Merge branch 'fix/graphs_in_alerts' into 'develop'
fixed related changes in phantomjs interface

See merge request artica/pandorafms!2029
2018-11-30 12:47:24 +01:00
vgilc f463c44e9c Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop'
fixed minor error slicebar

See merge request artica/pandorafms!2028
2018-11-30 12:46:54 +01:00
vgilc ce8e33ba29 Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop'
2517 api listar y crear perfiles de usuario en meta 6168 eucomm

See merge request artica/pandorafms!1905
2018-11-30 12:22:37 +01:00
vgilc 3cbb75b551 Merge branch '3044-Visualización-rara-en-agent-view' into 'develop'
Changed ORDER BY in SQL query - #3044

See merge request artica/pandorafms!1938
2018-11-30 11:02:14 +01:00
vgilc b8b43b33d7 Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm' into 'develop'
Ent 2520 api listar y crear repuestas de eventos 6165 eucomm

See merge request artica/pandorafms!1896
2018-11-30 10:50:59 +01:00
artica 2249ac4d8e Auto-updated build strings. 2018-11-30 00:01:26 +01:00
fbsanchez c728cb1412 fixed related changes in phantomjs interface 2018-11-29 17:26:41 +01:00
daniel 3bf215782e fixed minor error slicebar 2018-11-29 17:00:55 +01:00
alejandro-campos 8d2daf3948 fixed bug: pie graph not showing in mobile's tactical view dashboard widget 2018-11-29 16:08:41 +01:00
daniel 9bdd1af488 fixed errors in visual console 2018-11-29 13:24:12 +01:00
artica 4b1649d5f8 Auto-updated build strings. 2018-11-29 00:01:26 +01:00
alejandro-campos 9006a47650 fixed bug in function __() 2018-11-28 12:32:19 +01:00
danielmaya 590cef50f4 Fixed Automatic combined Graph in metaconsole 2018-11-28 09:48:58 +01:00
artica c48a0ffc49 Auto-updated build strings. 2018-11-28 00:01:25 +01:00
alejandro-campos 1cdc9c0d7f fixed label not showing on reload in visual console builder's percentile item for types bubble, circular progress bar interior and percentile 2018-11-27 18:23:18 +01:00
daniel 0460b465f0 fixed warnings and font chart for pdf report 2018-11-27 17:43:59 +01:00
alejandro-campos d48c228855 fixed label not showing on page reload in visual console's percentile item 2018-11-27 15:25:16 +01:00
alejandro-campos 89d2f831ba fixed labels not showing for percentile item in visual console builder 2018-11-27 11:35:59 +01:00
artica ad743d332e Auto-updated build strings. 2018-11-27 00:01:24 +01:00
alejandro-campos 8371e75757 modified event list visualization 2018-11-26 16:40:20 +01:00
artica b7546a5019 Auto-updated build strings. 2018-11-26 00:01:25 +01:00
artica 6bfe880dc8 Auto-updated build strings. 2018-11-25 00:01:24 +01:00
artica 53401e1f4d Auto-updated build strings. 2018-11-24 00:01:28 +01:00
vgilc bc70922acf Merge branch 'ent-2221-saml-php7-issues' into 'develop'
Patch to SAML login. It wont pass for pandora session handlers

See merge request artica/pandorafms!2015
2018-11-23 15:04:50 +01:00
vgilc a5f6bfe84f Merge branch 'ent-3147-mobile-console-pagination-bugfix' into 'develop'
Mobile console pagination bugfix

See merge request artica/pandorafms!2017
2018-11-23 12:54:53 +01:00
Alejandro Gallardo Escobar a7e78c30f3 Bugfix 2018-11-23 12:47:00 +01:00
vgilc 8f988dfb16 Merge branch 'ent-3144-mobile-console-event-detail-bugfix' into 'develop'
Fixed the event detail view on the mobile console

See merge request artica/pandorafms!2016
2018-11-23 12:42:27 +01:00
Alejandro Gallardo Escobar de08451c84 Bugfix 2018-11-23 12:21:35 +01:00
fermin831 cb9c6e35ba Patch to SAML login. It wont pass for pandora session handlers 2018-11-23 11:37:05 +01:00
vgilc cfeaea57ff Merge branch '3132-No_aparecen_campos_recon_task' into 'develop'
fixed minor error jquery

See merge request artica/pandorafms!2014
2018-11-23 11:11:39 +01:00
vgilc 9fef25c9a4 Merge branch '3137-Pete_jquery_en_tree_view_metaconsola' into 'develop'
fixed error events graphs

See merge request artica/pandorafms!2013
2018-11-23 10:51:06 +01:00
daniel 726cabb578 fixed minor error jquery 2018-11-23 10:47:57 +01:00
Alejandro Gallardo Escobar ba0b2d8bd4 Fixed an object unserialize from the session 2018-11-23 10:33:18 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
alejandro-campos 9a8197ea1e fix duplicated table in active-passive cluster's alert builder 2018-11-22 13:03:41 +01:00
danielmaya 62ad6b9a35 Added check of tags in report wizard 2018-11-22 10:39:48 +01:00
vgilc b4f3ce251b Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed errors in session with send mail alerts graph API

See merge request artica/pandorafms!2004
2018-11-22 09:01:47 +01:00
artica de77e52297 Auto-updated build strings. 2018-11-22 00:01:28 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 322c76b5e1 Merge remote-tracking branch 'origin/develop' into 2615-Bug_Session_Timeout 2018-11-21 16:52:20 +01:00
samucarc 099e0e6ed2 Fixed calendar in combined graphs 2018-11-21 16:28:43 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
vgilc 7be5225429 Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed errors session_start

See merge request artica/pandorafms!2003
2018-11-21 13:13:47 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 0344a5c2b0 Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed minor error session

See merge request artica/pandorafms!2000
2018-11-21 09:41:59 +01:00