Commit Graph

9587 Commits

Author SHA1 Message Date
alejandro-campos aae40d03a7 update translation strings
Former-commit-id: cd4ef67b08fea6bc20551b26aaa6a852869541f4
2018-12-07 13:44:48 +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
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 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
artica fe47a9c07e Auto-updated build strings. 2018-12-05 00:01:38 +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
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
artica 500601c67f Auto-updated build strings. 2018-12-04 00:01:28 +01:00
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
Alejandro Gallardo Escobar a4f2a65e3a Fixed the initial zoom and center of the networkmaps 2018-12-03 16:12:43 +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
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 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 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 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 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 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
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 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
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 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
daniel 726cabb578 fixed minor error jquery 2018-11-23 10:47:57 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +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
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
daniel 3f6384c690 fixed minor error session 2018-11-21 09:36:37 +01:00
artica fd6d830de3 Auto-updated build strings. 2018-11-21 00:01:25 +01:00
daniel a089a93477 fixed session bugs 2018-11-20 18:07:43 +01:00
vgilc 20cbe0d767 Merge branch 'ent-3109-no-se-ven-los-agentes-en-la-creacion-de-clusters' into 'develop'
Fixed query on function agents_get_group_agents

See merge request artica/pandorafms!1997
2018-11-20 17:37:07 +01:00
samucarc 80b39782e4 Fixed function report_value in reports 2018-11-20 14:16:25 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
2018-11-20 11:33:00 +01:00
fermin831 8a00fe5a30 Fixed query on function agents_get_group_agents 2018-11-20 10:58:58 +01:00
vgilc 6302dc634d Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
fixed minor error

See merge request artica/pandorafms!1996
2018-11-20 09:22:17 +01:00
daniel 2078014406 fixed minor error 2018-11-20 09:14:36 +01:00
artica 01ba290a68 Auto-updated build strings. 2018-11-20 00:01:29 +01:00
vgilc 522a098d24 Merge branch '2615-bug-session-timeout' into 'develop'
time used for session cookie expiration set to gmt time

See merge request artica/pandorafms!1995
2018-11-19 17:30:11 +01:00
daniel ee22d3988c fixed error ldap 2018-11-19 16:33:27 +01:00
alejandro-campos 2c5cd6627b time used for session cookie expiration set to gmt time 2018-11-19 16:33:27 +01:00
vgilc 34aea47449 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1993
2018-11-19 16:24:58 +01:00
daniel 9d80e940bf fixed minor error cfv 2018-11-19 16:17:20 +01:00
tatiana.llorente@artica.es 8e72f53aff Removed unnecessary loop - #3096 2018-11-19 16:07:45 +01:00
vgilc c499a21cc2 Merge branch '2615-bug-session-timeout' into 'develop'
time used for session cookie set to timezone current time instead of gmt time

See merge request artica/pandorafms!1991
2018-11-19 13:29:01 +01:00
alejandro-campos 3ffab647cb time used for session cookie set to timezone current time instead of gmt time 2018-11-19 13:21:25 +01:00
danielmaya 24fe48d5c5 Added token metaconsole_deploy_collection in the config 2018-11-19 12:12:10 +01:00
danielmaya 04ebb6b2c5 Added delete function in the api 2018-11-19 11:28:35 +01:00
daniel 105e93d069 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-19 08:42:30 +01:00
vgilc 96a36615cc Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1987
2018-11-19 08:39:16 +01:00
artica ce5c679ad6 Auto-updated build strings. 2018-11-19 00:01:29 +01:00
artica f2bf27d367 Auto-updated build strings. 2018-11-18 00:01:28 +01:00
artica 4021af48f9 Auto-updated build strings. 2018-11-17 00:01:31 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
fbsanchez b2ed4a9d2c standby software agent while disabling 2018-11-16 14:26:11 +01:00
vgilc d0d989ab19 Merge branch 'fix/db-retry-lock' into 'develop'
retried db query on error 1205 - lock

See merge request artica/pandorafms!1981
2018-11-16 13:15:06 +01:00
vgilc f99dadca39 Merge branch 'fix/ux-panel-historical-images' into 'develop'
Fix/ux panel historical images

See merge request artica/pandorafms!1984
2018-11-16 12:51:31 +01:00
fbsanchez 5c3b3a0e66 adjusted replication_interval default 2018-11-16 12:46:10 +01:00
daniel 0a097d185d fixed errors in custom fields view 2018-11-16 11:58:49 +01:00
tatiana.llorente@artica.es 8956ebd3c0 Changed the font styles of the labels - #3047 2018-11-16 11:46:41 +01:00
fbsanchez 50c3453415 change default values for event synch 2018-11-16 11:27:32 +01:00
daniel e6cd8c5471 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-16 09:11:49 +01:00
artica a0fde9503f Auto-updated build strings. 2018-11-16 00:01:29 +01:00
daniel e21fde537a fixed css errors custom field view and new features 2018-11-15 19:16:49 +01:00
vgilc a00c10a136 Merge branch '2166-Hide-not-init-agents-2' into 'develop'
removed hide not init modules from sla and availability report

See merge request artica/pandorafms!1976
2018-11-15 17:20:00 +01:00
vgilc 73590705e9 Merge branch '3079-Alertas_php7' into 'develop'
3079 alertas php7

See merge request artica/pandorafms!1980
2018-11-15 15:41:16 +01:00
daniel 7700ee85ca Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 15:34:08 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel 1edb7fda03 Merge remote-tracking branch 'origin/develop' into 3072-Problemas_jquery 2018-11-15 15:20:02 +01:00
daniel 34ea7cfbcb fixed position select autocomplete agent jqui 2018-11-15 15:19:43 +01:00
vgilc da410c9394 Merge branch '3079-Alertas_php7' into 'develop'
3079 alertas php7

See merge request artica/pandorafms!1978
2018-11-15 14:17:26 +01:00
daniel aee12e6bf9 Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 13:23:09 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
fermin831 b786c6c3ab Fixed snmptrap binary in windows trap generator 2018-11-15 13:04:35 +01:00
alejandro-campos a1846a6e22 removed hide not init modules from sla and availability report 2018-11-15 12:00:25 +01:00
vgilc 614efef0c4 Merge branch '3079-Alertas_php7' into 'develop'
create alert php7

See merge request artica/pandorafms!1975
2018-11-15 09:46:27 +01:00
artica e9e132589c Auto-updated build strings. 2018-11-15 00:01:29 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
vgilc e2612e2273 Merge branch '3072-Problemas_jquery' into 'develop'
fixed errors cv

See merge request artica/pandorafms!1974
2018-11-14 16:46:33 +01:00
daniel 60212dae50 fixed errors cv 2018-11-14 16:38:44 +01:00
nramon 0c019d1baf Merge branch 'fix/db_connect_charset' into 'develop'
removed default charset, set to auto

See merge request artica/pandorafms!1973
2018-11-14 12:36:17 +01:00
fbsanchez a20d541fb4 removed default charset, set to auto 2018-11-14 12:31:35 +01:00
samucarc dc6a293b52 Fixed error in agent table in GIS map 2018-11-14 11:53:12 +01:00
daniel 22a26aa072 fixed error upgrade jquery 2018-11-14 11:40:01 +01:00
artica 633d6987eb Auto-updated build strings. 2018-11-14 00:01:29 +01:00
manuel.montes dd7e623782 Fixed overflow in module data view 2018-11-13 17:04:14 +01:00
tatiana.llorente@artica.es b2996e59d5 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 16:50:35 +01:00