Commit Graph

9697 Commits

Author SHA1 Message Date
Alejandro Campos 4f7733d8e8 Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
fixed bug: failing load of post process and unit fields in plugin component in module creation

See merge request artica/pandorafms!1912

Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
artica 344e5f1a6f Auto-updated build strings.
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
fermin831 f0c0a86533 LDAP no hierarchy groups on node functionallity
Former-commit-id: a9fe31be70e178e190c0d0bacf1dd6e27e71f03b
2019-01-08 16:42:23 +01:00
Alejandro Campos 6e90172b59 Merge branch '2919-Bug-en-la-ayuda-de-plugin-en-la-creacion-de-un-modulo-de-tipo-plugin' into 'develop'
fixed english and spanish version of plugin-in macros help dialog

See merge request artica/pandorafms!1895

Former-commit-id: daf5cfd2aabda3284139069d403a6c327eeb682e
2019-01-08 15:38:07 +01:00
fermin831 0445e212fe Added default_no_hierarchy to config global variable
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
Tatiana Llorente 669c74c3dd Merge branch '2838-Vista-detalle-módulo-en-tree-view' into 'develop'
Removed text for modules with images - #2838

See merge request artica/pandorafms!1945

Former-commit-id: f9e95e0bf3262b8783c6b48927522d12d1edc2bf
2019-01-08 12:18:36 +01:00
Tatiana Llorente 7300f83552 Merge branch '2955-Group-view-cuenta-módulos-de-agentes-deshabilitados' into 'develop'
Added disabled field in sql query - #2955

See merge request artica/pandorafms!1893

Former-commit-id: 2eaba1884722b5294698620f9ca0464b12c7bd33
2019-01-08 12:17:09 +01:00
Tatiana Llorente 0cb7aa3d0e Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
Changed the font styles of the labels - #3047

See merge request artica/pandorafms!1982

Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
artica 02b497c250 Auto-updated build strings.
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
artica dd922c41fc Auto-updated build strings.
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
artica 48f1196400 Auto-updated build strings.
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
artica cf1d28cf8b Auto-updated build strings.
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +01:00
artica cfdde23d96 Auto-updated build strings.
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
samucarc 5ecc9276e0 Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
# Conflicts:
#	pandora_console/include/functions_api.php


Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc
2019-01-03 16:25:40 +01:00
fbsanchez 361b85efb8 Merge branch 'ent-3332-fallo-al-filtrar-por-grupos-en-prediction-module' into 'develop'
Fixed agents_get_group_agents while trying to get agent list from target group

See merge request artica/pandorafms!2107

Former-commit-id: 5c036aa603fbd341617b065dfa6bb870f652775e
2019-01-03 14:34:26 +01:00
artica d114a77151 Auto-updated build strings.
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
artica 5c16c08d59 Auto-updated build strings.
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
artica ff9f6549d4 Auto-updated build strings.
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
artica 5139308723 Auto-updated build strings.
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
artica 4356a8ce8e Auto-updated build strings.
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
artica 5e8b4b4500 Auto-updated build strings.
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
artica 60617def24 Auto-updated build strings.
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
fbsanchez 0686982055 Fixed agents_get_group_agents while trying to get agent list from target group
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
daniel ac228a7fad fixed error in massive operation
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
fbsanchez 2260e8d82a Merge branch 'ent-3326-7195-no-se-pueden-eliminar-elementos-de-modulo-sintetico-aritmetico' into 'develop'
minor fix in control messages format and processing

See merge request artica/pandorafms!2105

Former-commit-id: cc9453bfcf71cf47c8571ba338c84a5f87f0e70b
2018-12-28 11:48:56 +01:00
artica fcfd68f102 Auto-updated build strings.
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +01:00
fbsanchez c6b9122cfc minor fix in control messages format and processing
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
daniel a789b3350e fixed minor error pie chart
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
artica 2043546c52 Auto-updated build strings.
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
artica 5377cf6039 Auto-updated build strings.
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
artica 34502da313 Auto-updated build strings.
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
daniel ee7ff52a04 fixed error widgets wux
Former-commit-id: 149cfea6dc0d427b57f05594214374d220111031
2018-12-24 14:25:19 +01:00
daniel 7de36e1631 Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop'
fixed error template availability

See merge request artica/pandorafms!2086

Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
2018-12-24 09:23:35 +01:00
artica 86b1a3e424 Auto-updated build strings.
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
artica c5d4f395f2 Auto-updated build strings.
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
artica cba18381bd Auto-updated build strings.
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
vgilc b0b7e812f3 Merge branch '2315_Redireccion_consola_visual_Meta' into 'develop'
Fixed link in static graph

See merge request artica/pandorafms!1957

Former-commit-id: 5e68fabf271505484c336300cb5bffe8fb01fc9c
2018-12-21 11:36:50 +01:00
vgilc dd0165fe89 Merge branch '3042-Punto-de-inyeccion-sql' into 'develop'
avoid sql injection in visual_map_get_user_layouts function

See merge request artica/pandorafms!1951

Former-commit-id: cd680e3a3df45f6f54c6c2f25d118f97f30b8b81
2018-12-21 10:29:31 +01:00
vgilc 2d00336682 Merge branch '3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo' into 'develop'
Fixed function report_value in reports

See merge request artica/pandorafms!1998

Former-commit-id: 6456c469f1e94ccaf49a0272f0f76e30b0ee6f0f
2018-12-21 10:28:52 +01:00
vgilc 33f014695d Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
Fixed overflow in module data view

See merge request artica/pandorafms!1967

Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
vgilc 411c815f19 Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop'
Removed unnecessary loop - #3096

See merge request artica/pandorafms!1992

Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
2018-12-21 10:23:09 +01:00
vgilc 4f43396d81 Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop'
fixed bug: pie graph not showing in mobile's tactical view dashboard widget

See merge request artica/pandorafms!2027

Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
2018-12-21 10:22:41 +01:00
vgilc 2a407bb494 Merge branch '3253-Error_en_automatic_combined_graph_en_meta_con_varios_nodos' into 'develop'
fixed autocombined report metaconsole

See merge request artica/pandorafms!2077

Former-commit-id: 130262742f8bac0441b4b8285dc62bb0d3aa998a
2018-12-21 10:22:21 +01:00
vgilc 8c38ab63da Merge branch '3269-Errores_informe_availability_graph' into 'develop'
fixed errors in availability reports

See merge request artica/pandorafms!2088

Former-commit-id: 9497860a73fe05a656cc19423af8d9dce3f60d53
2018-12-21 10:18:24 +01:00
artica 2d08c75bae Auto-updated build strings.
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
fermin831 9531065dbe Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
2018-12-20 18:17:57 +01:00
artica 8c20c93806 Auto-updated build strings.
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
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
artica 8a6033e002 Auto-updated build strings.
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +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
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
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
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 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
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
artica 0648bf169c Auto-updated build strings.
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
2018-12-13 00:01:36 +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
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
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
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
artica 663c140b2b Auto-updated build strings.
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
danielmaya 50b1685e61 Added tagent_secondary_group in functions_reporting
Former-commit-id: ba4ac6e64e34810ae1f695840ba1af34bbcdc6c4
2018-12-10 17:34:18 +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
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
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
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
samucarc 517cb85547 Added new features in CLI to create and view alert commands 2018-12-03 17:38:57 +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