Commit Graph

18438 Commits

Author SHA1 Message Date
vgilc 21c9a7ee4a Merge branch '2127-Paginacion-en-busqueda-de-modulos' into 'develop'
added hidden input to policy modules filters form

See merge request artica/pandorafms!1597
2018-10-04 14:16:22 +02:00
vgilc be87cc41f1 Merge branch 'New_image__service_map' into 'develop'
Añadida icono service map

See merge request artica/pandorafms!1827
2018-10-04 14:15:38 +02:00
samucarc 6a19c2faec Añadida icono service map 2018-10-04 11:09:03 +02:00
artica 7ac581ac1e Auto-updated build strings. 2018-10-04 00:01:27 +02:00
fermin831 f3eae5e111 [Tags performance] Some agents_get_modules checks 2018-10-03 17:00:57 +02:00
fermin831 a33cae9e8f [Tags performance] Check functions_agents agents_get_modules 2018-10-03 16:33:56 +02:00
fermin831 0ca13b8e98 Removed unused code 2018-10-03 15:04:45 +02:00
fermin831 36fade6b37 Removed unwanted traces 2018-10-03 13:55:06 +02:00
fermin831 7bd0615681 [Tags performace] Check visual consoles 2018-10-03 13:53:59 +02:00
vgilc ef7ca68d4a Merge branch '1970_La_lista_de_campos_no_se_esta_aplicando_correctamente' into 'develop'
Fixed fields list in manage events-custom fields

See merge request artica/pandorafms!1633
2018-10-03 13:21:07 +02:00
samucarc 3c54710d1b Fixed conflicts 2018-10-03 13:09:39 +02:00
fermin831 b277c71c44 [Tags performance] Check massive operations 2018-10-03 13:02:51 +02:00
fermin831 3d1e2e4c79 Removed unused code 2018-10-03 11:14:11 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
danielmaya 942c5391f9 Fixed agents/modules view. it shows nothing if there are no agents and modules selected 2018-10-03 10:31:45 +02:00
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
fermin831 f767474516 [Tags performance] Fixed indexed agents_get_modules with no details 2018-10-02 15:30:19 +02:00
fermin831 8d5953ce50 Removed unused code 2018-10-02 15:01:40 +02:00
fermin831 2d057f9ae9 Fixed tags problems with secondary groups in tree view 2018-10-02 13:35:48 +02:00
fermin831 dc92a00b48 [Tags performance] Fixed performance of main agent view 2018-10-02 13:19:36 +02:00
danielmaya 14caf7bc07 Added new search input for the module name 2018-10-02 11:12:10 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +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
fermin831 995bfe0fad Removed unused code 2018-10-01 17:04:00 +02:00
fermin831 9a47d5325e [Tags performance] Events improvements 2018-10-01 17:03:37 +02:00
vgilc 660c126026 Merge branch '2623-Graficas_fallan_al_mostrar_datos_negativos' into 'develop'
fixed error values negative

See merge request artica/pandorafms!1819
2018-10-01 16:17:44 +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 17b183a6eb Merge branch '1807-Entities-en-el-nombre-de-modulo' into 'develop'
fixed minor bug: entities in module name

See merge request artica/pandorafms!1592
2018-10-01 15:16:03 +02:00
vgilc a7421fc385 Merge branch '1805_Campo_vacio_Informes_personalizados' into 'develop'
Added title in custom reports

See merge request artica/pandorafms!1632
2018-10-01 15:15:38 +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 4b583c7477 Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria' into 'develop'
Removed html entities in the audit views

See merge request artica/pandorafms!1631
2018-10-01 12:37:52 +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
vgilc e979de64b3 Merge branch '2454-Borrado-de-modulos-masivo-filtrado-por-no-inicilizado-elimina-todos-los-modulos-con-el-mismo-nombre' into 'develop'
fixed bug in modules massive deletion to avoid deletion of modules with the same…

See merge request artica/pandorafms!1629
2018-10-01 10:58:06 +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
fermin831 debf8db577 [Tags performance] Added some TODOs 2018-09-28 12:39:23 +02:00