2043546c52
Auto-updated build strings.
...
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
5377cf6039
Auto-updated build strings.
...
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
34502da313
Auto-updated build strings.
...
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
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
86b1a3e424
Auto-updated build strings.
...
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
c5d4f395f2
Auto-updated build strings.
...
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
cba18381bd
Auto-updated build strings.
...
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
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
74f4c58693
Merge branch '2584_Visual_en_Mapas_GIS' into 'develop'
...
Fixed minor visual error in GIS Map
See merge request artica/pandorafms!1971
Former-commit-id: 6cdaa62ad743a06e6e7f2d0e4026a04f953fcb16
2018-12-21 10:33:17 +01:00
9d557ced84
Merge branch '2855-Buscador-en-la-vista-de-modulo-de-grupos' into 'develop'
...
implemented search filters for module group and agent group in module groups view
See merge request artica/pandorafms!1956
Former-commit-id: 622169f4682d7197e6551e96568f6ff17f313f08
2018-12-21 10:32:45 +01:00
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
d4061641ec
Merge branch '3061-Mensaje-de-error-al-crear-un-modulo-sin-nombre' into 'develop'
...
fixed error message
See merge request artica/pandorafms!1964
Former-commit-id: 55944da11dcd55a19e9147bc4520431dedc3a19a
2018-12-21 10:29:14 +01:00
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
0ec0af6e6e
Merge branch '2980-Ajuste-de-dimensiones-en-custom-graph' into 'develop'
...
Removed the adjustment of dimensions in custom graph
See merge request artica/pandorafms!1946
Former-commit-id: ee5fe8d83c851b2ade8d8b4c6966a23116716d24
2018-12-21 10:26:47 +01:00
b9fd907933
Merge branch '2992-Realtime-Graph-decimales' into 'develop'
...
Implemented limitation decimals in y-axis realtime graphs
See merge request artica/pandorafms!1941
Former-commit-id: 0ca73da98323fa3880cccd96d12150228ce2dead
2018-12-21 10:25:57 +01:00
3fd61e8d81
Merge branch '3016-URL-Address-de-un-agente-no-funciona-link_2' into 'develop'
...
Added hint to url address input
See merge request artica/pandorafms!2099
Former-commit-id: 4b8d92593b6a1eae46f1cbb0670734fde7c90ae6
2018-12-21 10:25:04 +01:00
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
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
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
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
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
8e4e4d8559
Merge branch '1440-Exportar-informes-pdf-en-formato-apaisado' into 'develop'
...
added new field in treport table
See merge request artica/pandorafms!1927
Former-commit-id: aeae9fa575683cb2df29ceb3e8cfd346fd475a98
2018-12-21 10:17:24 +01:00
2d08c75bae
Auto-updated build strings.
...
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
5c0f85a4bb
fix bug when searching non existing agent group in module groups view
2018-12-20 15:37:00 +01:00
ac4d420173
Added hint to url address input
...
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08:46 +01:00
8c20c93806
Auto-updated build strings.
...
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
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
a1ba6fdf07
Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
...
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
2018-12-19 19:15:43 +01:00
8a6033e002
Auto-updated build strings.
...
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
c9ac5d9313
Merge branch 'fix/suse-rpm' into 'develop'
...
force suse spec to php7
See merge request artica/pandorafms!2091
Former-commit-id: 66c13866c995655debe5e17d0e1a8dd49d68d4ce
2018-12-17 17:31:23 +01:00
6d69ffc955
force suse spec to php7
...
Former-commit-id: 90f4142b7b1a95f8230ccba50fa4a914dc0ef55c
2018-12-17 17:20:33 +01:00
c57b8bd94a
Merge branch '3276-Drop-database-if-exist-duplicado' into 'develop'
...
Removed if localhost - #3276
See merge request artica/pandorafms!2089
Former-commit-id: a7a9bca62544e30fe420793674afc896a63a452c
2018-12-17 15:06:17 +01:00
814c89a9a9
Removed if localhost - #3276
...
Former-commit-id: 67de83efe6a6c7aa4458beb226091df0d6ec21e7
2018-12-17 14:48:16 +01:00
225635a774
fixed errors in availability reports
...
Former-commit-id: 0783d9b68bf5f3373579db9f0b09e7506d95ea84
2018-12-17 13:20:57 +01:00
b25686713d
Merge branch '2332-Feature-sincronización-de-políticas-y-colecciones-dev' into 'develop'
...
Added token metaconsole_deploy_inventory_plugin in functions_config
See merge request artica/pandorafms!2087
Former-commit-id: 2c88fee48fa7fdf8df86566006035c96f1424397
2018-12-17 12:14:43 +01:00
b530447474
Added token metaconsole_deploy_inventory_plugin in functions_config
...
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
84a0f227b9
fixed error template availability
...
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
7f9ee21b4b
Auto-updated build strings.
...
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00
e1bce89923
Auto-updated build strings.
...
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
2018-12-16 00:01:25 +01:00
7af8f01b59
Auto-updated build strings.
...
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +01:00
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
b26d13db54
Auto-updated build strings.
...
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
2018-12-14 00:01:32 +01:00
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
b06790cc1a
Merge remote-tracking branch 'origin/develop' into 3177-Send_custom_report
...
Former-commit-id: 3bb953eb2b06d3c827093a0648c722c5281d73d5
2018-12-13 17:24:10 +01:00
807f7a0b74
fixed minor error
...
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
2018-12-13 17:24:01 +01:00
d76612b247
Minor fix
...
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +01:00
d8285c0ca2
Added a pending translation
...
Former-commit-id: 6272217de4eb47fe70eac214bf50b34da6aa20bb
2018-12-13 16:49:31 +01:00
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
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
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
artica
daniel
vgilc
alejandro-campos
manuel.montes
samucarc
fbsanchez
tatiana.llorente@artica.es
danielmaya
Alejandro Gallardo Escobar