tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,931 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

18931 Commits

Author SHA1 Message Date
artica d28b229423 Auto-updated build strings. 2018-11-08 00:01:29 +01:00
daniel 5c99a8138f fixed minor error 2018-11-07 17:16:25 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
vgilc 1a1d847cee Merge branch '3045-Falta-un-botón-en-Visual-Styles' into 'develop' 
Fixed bug in visual styles configuration

See merge request artica/pandorafms!1944
 2018-11-07 16:46:49 +01:00
manuel.montes c131c631d4 Fixed bug in visual styles configuration 2018-11-07 16:34:09 +01:00
vgilc f413ae18b2 Merge branch '2571_Comprobacion_paradas_planificadas_CLI_4' into 'develop' 
Fixed minor visual error in planned downtimes

See merge request artica/pandorafms!1943
 2018-11-07 16:26:30 +01:00
samucarc 46a7d4c5f5 Fixed minor visual error in planned downtimes 2018-11-07 16:19:54 +01:00
vgilc 9142b82131 Merge branch '3048-fallo-configuracion-remota-servidor' into 'develop' 
re-initialize pandorafms_server after configuration change

See merge request artica/pandorafms!1942
 2018-11-07 16:17:15 +01:00
fbsanchez df5e6daf7b re evaluate enterprise capabilities on configuration reload 2018-11-07 15:59:19 +01:00
vgilc 6cdb38b8ee Merge branch '2974-Fallo_al_hacer_over_en_graficas' into 'develop' 
fixed minor errors in graphs an license diag

See merge request artica/pandorafms!1940
 2018-11-07 15:06:29 +01:00
fbsanchez 7407431343 re-initialize pandorafms_server after configuration change 2018-11-07 14:57:20 +01:00
daniel 58aa334798 fixed minor errors in graphs an license diag 2018-11-07 13:33:07 +01:00
daniel 218bf81fa1 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-07 13:30:19 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
daniel 267f83cc4c add datatabes 2018-11-07 13:25:02 +01:00
daniel 7d54858b45 delete files dont use 2018-11-07 13:24:07 +01:00
vgilc 9c143d1d00 Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop' 
fixed agent name and go to agent edition links in meta tree view

See merge request artica/pandorafms!1939
 2018-11-07 12:49:15 +01:00
vgilc ae6f746d41 Merge branch '2865-Problema-con-el-filtro-de-grupo-en-Agent-Module-View-dev' into 'develop' 
Fixed filter group in agents/modules view

See merge request artica/pandorafms!1892
 2018-11-07 12:36:10 +01:00
danielmaya 3ffd976365 resolved conflicts in ver_agente 2018-11-07 12:31:54 +01:00
alejandro-campos 2a616e1448 fixed agent name and go to agent edition links in meta tree view 2018-11-07 12:29:37 +01:00
tatiana.llorente@artica.es aa19640497 Changed ORDER BY in SQL query - #3044 2018-11-07 10:34:14 +01:00
vgilc c7a54182a3 Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop' 
Added check for the creation of planned downtimes by pandora manage

See merge request artica/pandorafms!1936
 2018-11-07 08:48:48 +01:00
vgilc 2df671ba86 Merge branch 'ent-2705-eliminar-fichero-empty-en-la-carpeta-collection-del-agente-2' into 'develop' 
Create collections folder like a symlink

See merge request artica/pandorafms!1937
 2018-11-07 08:48:27 +01:00
artica a01f79d294 Auto-updated build strings. 2018-11-07 00:01:31 +01:00
fermin831 343b4767be Create collections folder like a symlink 2018-11-06 18:23:21 +01:00
vgilc eec3b1843d Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop' 
2900 mensajes de error y success al mismo tiempo en la edición de usuarios

See merge request artica/pandorafms!1863
 2018-11-06 17:08:54 +01:00
vgilc c18bb1c827 Merge branch 'revert-ea0474e7' into 'develop' 
Revert "Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'"

See merge request artica/pandorafms!1935
 2018-11-06 17:00:11 +01:00
samucarc a80c7e493e Added check for the creation of planned downtimes by pandora manage 2018-11-06 16:42:03 +01:00
vgilc 919a800a0a Revert "Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'" 
This reverts merge request !1727
 2018-11-06 16:41:15 +01:00
vgilc c50b1b7243 Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl-2' into 'develop' 
Fixed delete menu on main page dashboards

See merge request artica/pandorafms!1932
 2018-11-06 15:23:42 +01:00
vgilc 1698f663a5 Merge branch '2730-Fallo-políticas-desde-la-meta3' into 'develop' 
Fixed bug in deleted policies

See merge request artica/pandorafms!1934
 2018-11-06 15:23:09 +01:00
vgilc 78c88c4f8f Merge branch '3021-SLA-vista-descolocada' into 'develop' 
Removed duplicated code - #3021

See merge request artica/pandorafms!1933
 2018-11-06 15:22:33 +01:00
vgilc 62b27284aa Merge branch '3000-lost-in-stash' into 'develop' 
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options

See merge request artica/pandorafms!1919
 2018-11-06 15:03:36 +01:00
fbsanchez bfc669225c Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash 2018-11-06 14:48:14 +01:00
manuel.montes df8c5e8bf9 Fixed bug in deleted policies 2018-11-06 13:52:03 +01:00
tatiana.llorente@artica.es 26a4880f64 Removed duplicated code - #3021 2018-11-06 13:49:47 +01:00
fermin831 6ede68bf8d Fixed delete menu on main page dashboards 2018-11-06 13:10:44 +01:00
vgilc 1435b196db Merge branch '2973-La-paginación-en-la-vista-de-módulos-de-agente-no-funciona' into 'develop' 
Fixed SQL query - #2973

See merge request artica/pandorafms!1931
 2018-11-06 12:09:15 +01:00
tatiana.llorente@artica.es 9448111927 Fixed SQL query - #2973 2018-11-06 11:14:12 +01:00
artica 3ffad9fda8 Auto-updated build strings. 2018-11-06 00:01:27 +01:00
manuel.montes 45b757b5db Fixed bug in SNMP Wizard 2018-11-05 14:17:43 +01:00
vgilc 4102f11f6b Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo_2' into 'develop' 
2618 bug acceso agentes en vista de grupo 2

See merge request artica/pandorafms!1928
 2018-11-05 13:11:44 +01:00
samucarc 3d99ef48aa Fixed ACLs in monitoring View and agent detail 2018-11-05 13:05:34 +01:00
daniel 7a7fcaa6a8 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-05 09:35:38 +01:00
daniel b71d396c84 WIP custom fields view 2018-11-05 09:35:17 +01:00
artica 50b8886916 Auto-updated build strings. 2018-11-05 00:01:25 +01:00
artica f9e2936df5 Auto-updated build strings. 2018-11-04 00:01:25 +01:00
artica afd922426e Auto-updated build strings. 2018-11-03 00:01:27 +01:00
daniel e2fabb6167 WIP custom fields view 2018-11-02 13:37:30 +01:00
vgilc 6ca12b12e8 Merge branch '2768-Mensajería-interna_2' into 'develop' 
Well centered message modal window - #2768

See merge request artica/pandorafms!1926
 2018-11-02 13:25:02 +01:00