Commit Graph

19335 Commits

Author SHA1 Message Date
daniel 17b2ff2819 Merge branch '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop'
fixed error migratesql

See merge request artica/pandorafms!2095

Former-commit-id: 672aed5f3493d7981398af0062a76c9255c0a87a
2019-01-02 11:50:32 +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
fbsanchez 60ae0c8b78 Merge branch 'ent-3335-build_vars-fecha-mal' into 'develop'
changed %g to %y in date commands

See merge request artica/pandorafms!2108

Former-commit-id: 3f964c5800313ccb13367273a97af7f853692bac
2018-12-31 11:51:54 +01:00
fbsanchez c3daf1f995 changed %g to %y in date commands
Former-commit-id: 8e0c9a44ff79b049a4c9039537bbc3c23f2decfc
2018-12-31 11:44:06 +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
daniel ed30441f86 fixed error migrate 6 to 7
Former-commit-id: 117cd6b7b16e0b8cf0c69f50e87665732e241690
2018-12-28 13:42:40 +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
daniel 2b3a7e8a9f Merge branch '3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo' into 'develop'
fixed error module editor

See merge request artica/pandorafms!2103

Former-commit-id: db42869e06f097e8d0ae54c0be31065029613107
2018-12-28 12:06:56 +01:00
fbsanchez fc5d3170b5 fixed warn/err messages in module_manager_editor
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
fbsanchez 17e773adcb Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo
Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +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 fef1b55b5b Merge branch '3327-No_se_ve_las_piegrafica_de_los_agentes' into 'develop'
fixed minor error pie chart

See merge request artica/pandorafms!2104

Former-commit-id: ba77d41b0b54f462fcc3653694d352141aff00e1
2018-12-27 13:43:43 +01:00
daniel 6d8b73f72e fix minor error module editor network
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
daniel a789b3350e fixed minor error pie chart
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
daniel c0869b3c9e fixed error module editor
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
artica 2043546c52 Auto-updated build strings.
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
fbsanchez 4229be94bf Merge remote-tracking branch 'origin/develop' into 2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola
Former-commit-id: f6f1fd106a21820cc3f9f93e11fd0f5907986cd8
2018-12-26 17:51:11 +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
daniel 7e2fb25e27 fixed errors in massive operation edit modules
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +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
fermin831 755b832851 Accept module_crontab with whitespaces at the end of definition and be more verbose
Former-commit-id: 55bd4acb8acf9c90eed3b1820c7cd8fb30328841
2018-12-21 13:46:15 +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 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
vgilc 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
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 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
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 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
vgilc 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
vgilc 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
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
vgilc 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
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