enriquecd
|
c0dd2bcab6
|
Add status data to get_all_agents API response - #2881
|
2018-10-05 12:57:25 +02:00 |
|
vgilc
|
740a7f0327
|
Merge branch '2741-Refactorizar_vista_module_groups_2' into 'develop'
fixed minor error counters alert fired in module_group view
See merge request artica/pandorafms!1833
|
2018-10-05 12:02:15 +02:00 |
|
daniel
|
a59ecc7ef3
|
fixed minor error counters alert fired in module_group view
|
2018-10-05 11:55:06 +02:00 |
|
vgilc
|
f9d4c8e51c
|
Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria_2' into 'develop'
Eliminadas entidades html de vista de auditoria
See merge request artica/pandorafms!1830
|
2018-10-05 09:17:36 +02:00 |
|
artica
|
ec8d36f8eb
|
Auto-updated build strings.
|
2018-10-05 00:01:30 +02:00 |
|
vgilc
|
5abee8a5a9
|
Merge branch '2749-6381-plugin-para-monitorizacion-de-servicios-y-watchdog-bajo-demanda' into 'develop'
PluginTools Added global alerts to parse_arguments
See merge request artica/pandorafms!1832
|
2018-10-04 17:35:43 +02:00 |
|
fbsanchez
|
b67eb9ae16
|
PluginTools Added global alerts to parse_arguments
|
2018-10-04 17:30:48 +02:00 |
|
samucarc
|
530017a79d
|
Eliminadas entidades html de vista de auditoria
|
2018-10-04 17:02:38 +02:00 |
|
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 |
|
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 |
|
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 1d726d59f3876c8e70da369788ad03f0c345f0e8.
|
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 |
|
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 |
|
vgilc
|
06d71a905f
|
Merge branch 'ent-2556-realtime-graphs-with-shorter-y-axis-numbers' into 'develop'
Now the integer numbers of the Y axis of the realtime graphs are shorter
See merge request artica/pandorafms!1770
|
2018-09-28 11:20:31 +02:00 |
|
vgilc
|
52ce322e48
|
Merge branch '2809-SSL-autogenerado-con-phantom' into 'develop'
htaccess. Allow connections from localhost to pandora_console/attachment
See merge request artica/pandorafms!1813
|
2018-09-28 11:06:15 +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
|
01d5c2fce9
|
Merge branch '2435-Botones-superpuestos-mensajeria-interna-pandora' into 'develop'
fixed visual bug: buttons in message edit bad positioned
See merge request artica/pandorafms!1601
|
2018-09-28 10:51:58 +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
|
6dab92aa88
|
Merge branch '2494-Error-al-generar-informe-en-meta' into 'develop'
fixed wrong percentage in meta availability report
See merge request artica/pandorafms!1614
|
2018-09-28 10:39:20 +02:00 |
|
vgilc
|
ed30ed1f84
|
Merge branch '2503_Descuadre_Visual_Recon_Task_Windows' into 'develop'
Fixed Windows visual mismatch of the Recon task
See merge request artica/pandorafms!1619
|
2018-09-28 10:38:57 +02:00 |
|