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

9054 Commits

Author SHA1 Message Date
vgilc 46830a4cbe Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop' 
fixed issue with string data in visual map

See merge request artica/pandorafms!1811
 2018-10-03 09:31:02 +02:00
artica f39788d8ef Auto-updated build strings. 2018-10-03 00:01:28 +02:00
vgilc ca67f52fb4 Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop' 
2670 nuevo widget dashboard system group status

See merge request artica/pandorafms!1795
 2018-10-02 17:25:19 +02:00
alejandro-campos 62548c7f94 Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-10-02 17:11:02 +02:00
vgilc 7db6ae54ff Merge branch '2857-Falta-imagen-de-fondo-para-preview-de-logo-en-visual-setup-de-meta' into 'develop' 
edited css class ui-widget-content

See merge request artica/pandorafms!1822
 2018-10-02 15:39:18 +02:00
vgilc 5668857914 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
2479 errores en vista de alertas de meta

See merge request artica/pandorafms!1821
 2018-10-02 15:37:08 +02:00
artica 08a3aabdf2 Auto-updated build strings. 2018-10-02 00:01:33 +02:00
alejandro-campos 1c2743797e Revert "fixed conflict" 
This reverts commit 1d726d59f3.
 2018-10-01 18:16:55 +02:00
alejandro-campos e5e81e55d7 edited css class ui-widget-content 2018-10-01 17:58:29 +02:00
alejandro-campos 1d726d59f3 fixed conflict 2018-10-01 15:34:36 +02:00
alejandro-campos 6b14754137 fixed conflict 2018-10-01 15:30:43 +02:00
daniel b5ebd81b19 fixed error values negative 2018-10-01 15:24:29 +02:00
vgilc 706a3ca4c0 Merge branch '2479-Errores-en-vista-de-alertas-de-meta' into 'develop' 
fixed bug in meta alert view: action field (other than default) not showing

See merge request artica/pandorafms!1621
 2018-10-01 14:45:16 +02:00
alejandro-campos 0c899f5078 Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta 
Conflicts:
	pandora_console/include/functions_ui.php
 2018-10-01 14:03:30 +02:00
vgilc 600ee87149 Merge branch '2659-Usuarios-LDAP-no-se-actualizan-ante-cambio-de-permisos-dev' into 'develop' 
Added check permissions in ldap login

See merge request artica/pandorafms!1785
 2018-10-01 12:41:09 +02:00
vgilc 62dcf0f342 Merge branch '2459_No_se_ve_el_icono_por_defecto_del_widget_de_bienvenida' into 'develop' 
Fixed welcome icone

See merge request artica/pandorafms!1640
 2018-10-01 12:38:49 +02:00
vgilc d9a8e30229 Merge branch '2138-En-la-API-se-esta-usando-el-nombre-del-agente-para-filtrar-en-lugar-del-alias' into 'develop' 
Agent filtering by alias

See merge request artica/pandorafms!1627
 2018-10-01 12:30:09 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop' 
refactoriced view module_groups

See merge request artica/pandorafms!1788
 2018-10-01 10:59:09 +02:00
artica 779f3c6c60 Auto-updated build strings. 2018-10-01 00:01:23 +02:00
artica 46373616fa Auto-updated build strings. 2018-09-30 00:01:22 +02:00
artica 2606b73e57 Auto-updated build strings. 2018-09-29 00:01:27 +02:00
vgilc 2dac09435a Merge branch '2040-Tags-en-operaciones-masivas' into 'develop' 
fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613
 2018-09-28 11:05:34 +02:00
vgilc 7d3916fcb7 Merge branch '2436-Estadisticas-de-incidentes' into 'develop' 
removed watermark from incidents statistics graphs

See merge request artica/pandorafms!1598
 2018-09-28 10:51:36 +02:00
vgilc d5b9ddec46 Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop' 
Added new funcionality to cluster alert configuration: update alert

See merge request artica/pandorafms!1634
 2018-09-28 10:50:44 +02:00
vgilc d933a966eb Merge branch '2478-Logo-meta' into 'develop' 
changed background of meta visual setup logo previews

See merge request artica/pandorafms!1641
 2018-09-28 10:50:13 +02:00
vgilc ad5581f0c2 Merge branch '2491-Alert-view-meta' into 'develop' 
fixed bug in meta alert view: agent names not showing in table

See merge request artica/pandorafms!1618
 2018-09-28 10:39:52 +02:00
vgilc d31a2f4cc4 Merge branch 'ent-2763-snmp-traps' into 'develop' 
Added recalculate counters when a status module is forced by console

See merge request artica/pandorafms!1794
 2018-09-28 10:29:14 +02:00
vgilc 4d2413b39b Merge branch '2501-Crear-SO-con-la-API' into 'develop' 
added methods to api (metaconsole and node) to create and update operating systems

See merge request artica/pandorafms!1654
 2018-09-28 10:26:47 +02:00
vgilc dec9021702 Merge branch '2548_Bug_edicion_modulos_operaciones_masivas' into 'develop' 
Fixed tags in module bulk operations

See merge request artica/pandorafms!1639
 2018-09-28 10:25:38 +02:00
vgilc f98e2ed1bf Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations' into 'develop' 
Fixed error in agents bulk operations with a normal status

See merge request artica/pandorafms!1709
 2018-09-28 10:24:27 +02:00
vgilc eb5d169b53 Merge branch '2727-Link-publico-de-console-visual' into 'develop' 
new parameter has been passed in to check whether or not we are at a public…

See merge request artica/pandorafms!1808
 2018-09-28 10:04:52 +02:00
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop' 
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
 2018-09-28 10:04:12 +02:00
vgilc 2fe350ed75 Merge branch '2816-Reports-de-custom-graphs-no-funcionan-si-le-ponemos-un-nombre-a-la-custom-graph' into 'develop' 
fixed bug: reporting of custom graphs not showing graph when graph name is empty

See merge request artica/pandorafms!1809
 2018-09-28 09:58:11 +02:00
artica 1a60aee7a6 Auto-updated build strings. 2018-09-28 00:01:25 +02:00
artica 79961b91d0 Auto-updated build strings. 2018-09-27 00:01:24 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
artica 643da5c993 Auto-updated build strings. 2018-09-26 00:01:28 +02:00
alejandro-campos 24de9d9119 fixed bug: reporting of custom graphs not showing graph when graph name is empty 2018-09-25 17:33:29 +02:00
fermin831 22b46e41f1 Added standby mode on disabled token of API function set update_agent 2018-09-25 15:59:33 +02:00
alejandro-campos 2bae8a0c54 new parameter has been passed in to check whether or not we are at a public console when obtaining url of child console 2018-09-25 13:58:19 +02:00
vgilc 92381141b9 Merge branch '1979-5352-plugin-de-monitorizacion-log-apache-dev' into 'develop' 
Added help_log_viewer

See merge request artica/pandorafms!1805
 2018-09-25 08:31:02 +02:00
artica f280e54738 Auto-updated build strings. 2018-09-25 00:01:26 +02:00
danielmaya 97a5f5ba97 Added help_log_viewer 2018-09-24 17:58:23 +02:00
artica 010207e6ad Auto-updated build strings. 2018-09-24 00:01:23 +02:00
artica bd0176070a Auto-updated build strings. 2018-09-23 00:01:23 +02:00
artica 25f91a451e Auto-updated build strings. 2018-09-22 00:01:24 +02:00
fermin831 da3061651b Fixed search agentes and modules in others tree views 2018-09-21 13:01:40 +02:00
fermin831 df660091ae Fixed search group in others tree views 2018-09-21 11:48:23 +02:00
fermin831 a097fdf5e6 Added recalculate counters when a status module is forced by console 2018-09-21 11:15:25 +02:00
vgilc ce2a21c70b Merge branch 'ent-2798-no-se-pueden-anadir-agentes-a-politicas-desde-la-meta' into 'develop' 
Added some secondary groups checks to meta

See merge request artica/pandorafms!1790
 2018-09-21 08:37:34 +02:00