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

18670 Commits

Author SHA1 Message Date
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
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
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
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
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
tatiana.llorente@artica.es 233b9c2c70 Well centered message modal window - #2768 2018-11-02 13:07:38 +01:00
vgilc 2873d4b962 Merge branch '2786-Errores-en-mapas-de-red-return-dev' into 'develop' 
Fixed nodes count in pandora_networkmap

See merge request artica/pandorafms!1924
 2018-11-02 11:45:11 +01:00
danielmaya 3c78e387df Fixed nodes count in pandora_networkmap 2018-11-02 11:32:07 +01:00
vgilc d79a918eed Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed minor error cluster name by alias

See merge request artica/pandorafms!1923
 2018-11-02 10:39:20 +01:00
daniel c4eeb3cc76 fixed error edit modules in massive operation php7 error select 2018-11-02 10:18:33 +01:00
daniel f2b1c99013 fixed minor error cluster name by alias 2018-11-02 09:56:31 +01:00
artica fc82a9d172 Auto-updated build strings. 2018-11-02 00:01:26 +01:00
artica f47918b4cc Auto-updated build strings. 2018-11-01 00:01:31 +01:00
vgilc 5694a16f74 Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop' 
Fixed agent popup with secondary groups privileges in tree view

See merge request artica/pandorafms!1922
 2018-10-31 17:39:13 +01:00
Fermin 9f0e43623b Fixed agent popup with secondary groups privileges in tree view 2018-10-31 16:16:32 +01:00
vgilc e3f6a794a4 Merge branch '2716-ue-plugin-modifications' into 'develop' 
Improved LWP ssl ignore certificate added extra debug

See merge request artica/pandorafms!1723
 2018-10-31 16:00:46 +01:00
fbsanchez 7f093b29e3 Merge remote-tracking branch 'origin/develop' into 2716-ue-plugin-modifications 2018-10-31 15:48:57 +01:00
vgilc 49f1e79c22 Merge branch 'ent-2999-6711-estan-apareciendo-modulos-deshabilitados-en-v728-dentro-de-la-vista-de-modulos-de-un-agente' into 'develop' 
Fixed disabled modules on agent view

See merge request artica/pandorafms!1921
 2018-10-31 11:46:16 +01:00
Fermin 7f22e2b067 Fixed disabled modules on agent view 2018-10-31 08:57:34 +01:00
artica d9f8616b2c Auto-updated build strings. 2018-10-31 00:01:26 +01:00
vgilc 9d80681b06 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
snapshot viewer fix

See merge request artica/pandorafms!1920
 2018-10-30 18:36:06 +01:00
fbsanchez 39b6164526 snapshot viewer fix 2018-10-30 18:20:10 +01:00
fbsanchez 8fe82add30 ondemand pluginTools, pandora_df inodes, cde functions_api cluster options 2018-10-30 17:53:57 +01:00
vgilc 94c008bc21 Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed warnings php7

See merge request artica/pandorafms!1918
 2018-10-30 17:47:42 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
vgilc b1bf1d7b4b Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
2326 unificar vistas ux y wux en un mismo portal

See merge request artica/pandorafms!1917
 2018-10-30 16:20:26 +01:00