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

17813 Commits

Author SHA1 Message Date
vgilc 6c695999e8 Merge branch '2416-Popup-feo-y-erroneo-editor-de-modulos' into 'develop' 
changed width of changing snmp module name alert popup

See merge request artica/pandorafms!1589
 2018-07-03 14:03:29 +02:00
vgilc 128d3178c8 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms' into 'develop' 
Remove the 'All Groups' option in non-administrators users

See merge request artica/pandorafms!1590
 2018-07-03 14:02:49 +02:00
fermin831 d1eaef6f6d Fixed filter count in agent detail. 2018-07-03 13:22:23 +02:00
manuel.montes 54a74c43d0 Remove the 'All Groups' option in non-administrators users 2018-07-03 13:11:00 +02:00
alejandro-campos 0cf3aa2e78 changed width of changing snmp module name alert popup 2018-07-03 12:50:28 +02:00
fbsanchez f430b8998f Added DB changes to support ProvisioningServer 2 2018-07-03 12:01:37 +02:00
daniel e765e4fe08 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios_2 2018-07-03 08:55:41 +02:00
artica 95678f706b Auto-updated build strings. 2018-07-03 00:01:23 +02:00
daniel 0f9b7d13ee fixed errors cps in meta and others 2018-07-02 17:14:31 +02:00
vgilc 0040837f4b Merge branch 'ent-2375-servidores-sin-referenciar' into 'develop' 
Fixed new servers (migration and autoprovision) icons

See merge request artica/pandorafms!1564
 2018-07-02 09:48:28 +02:00
artica 61668b4cd7 Auto-updated build strings. 2018-07-02 00:01:25 +02:00
artica 960bc8db31 Auto-updated build strings. 2018-07-01 00:01:26 +02:00
artica bf72f8ec3e Auto-updated build strings. 2018-06-30 00:01:30 +02:00
slerena 6da5736a4b Merge branch '2354-Fallo-grafico-tarta-consola-visual' into 'develop' 
Changed function that gets pie graphs module data to print no data to show message in such case

See merge request artica/pandorafms!1581
 2018-06-29 15:44:29 +02:00
slerena 56ff8706a5 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop' 
2396-fallo-acl-en-vista-de-cluster

See merge request artica/pandorafms!1582
 2018-06-29 15:43:42 +02:00
slerena 5095ddaf3f Merge branch '2285-La-ordenacion-de-elementos-en-las-custom-graph-no-se-aplica-en-las-graficas' into 'develop' 
fixed bug when ordering module list in custom graphs

See merge request artica/pandorafms!1583
 2018-06-29 15:37:11 +02:00
slerena b7bd120411 Merge branch '2416-Popup-feo-y-erroneo-editor-de-modulos' into 'develop' 
changed size of changing snmp module name alert popup

See merge request artica/pandorafms!1584
 2018-06-29 15:33:44 +02:00
alejandro-campos c400b261ff changed size of changing snmp module name alert popup 2018-06-29 14:57:40 +02:00
alejandro-campos ae1f7a4814 fixed bug when ordering module list in custom graphs 2018-06-29 14:35:49 +02:00
manuel.montes 5436c64800 Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster 2018-06-29 08:52:46 +02:00
artica d41df8335c Auto-updated build strings. 2018-06-29 00:01:29 +02:00
alejandro-campos 05f38eb9e1 Changed function that gets pie graphs module data to print no data to show message in such case 2018-06-28 18:28:18 +02:00
manuel.montes 4f23407ea8 Fixed for group All 2018-06-28 17:03:02 +02:00
daniel 1b1bc4aa2e add new column evaluate_sla into table tservice 2018-06-28 13:34:55 +02:00
nramon e1d41c25b1 Merge branch '2227-plugin-de-ancho-de-banda-mcm-neh' into 'develop' 
2227 plugin de ancho de banda mcm neh

See merge request artica/pandorafms!1579
 2018-06-28 09:04:13 +02:00
artica 73dca0446c Auto-updated build strings. 2018-06-28 00:01:34 +02:00
fbsanchez a57570174c Fix in PluginTools (default value for tentacle port) 2018-06-27 18:54:35 +02:00
slerena ce61639101 Merge branch '2413-No-se-ven-graficas-en-informes-de-avg-ni-min-value' into 'develop' 
fixed bug to draw charts in custom reports

See merge request artica/pandorafms!1577
 2018-06-27 18:13:03 +02:00
slerena 8f294cfe47 Merge branch '2411-Eventos-custom-fields' into 'develop' 
changed selectboxes width to fit length of the fields

See merge request artica/pandorafms!1575
 2018-06-27 18:12:15 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop' 
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
 2018-06-27 18:10:41 +02:00
alejandro-campos 25d252a8a4 fixed bug to draw charts in custom reports 2018-06-27 17:24:40 +02:00
nramon dd3c498af1 Merge branch '2423-Se_toman_como_data_las_graficas_boleanas-2' into 'develop' 
2423 se toman como data las graficas boleanas 2

See merge request artica/pandorafms!1576
 2018-06-27 16:26:00 +02:00
daniel 65eb4744a1 fixed boolean graph no zoom 2018-06-27 16:17:17 +02:00
daniel 8ae27da3b7 add cascade protection services in server 2018-06-27 15:39:13 +02:00
daniel 85897315cd cascade protection services 2018-06-27 15:03:46 +02:00
fbsanchez 623afea5fe Minor changes in PluginTools 
Added missing plugins to update_version
 2018-06-27 12:21:21 +02:00
alejandro-campos 2a2a322f55 changed selectboxes width to fit length of the fields 2018-06-27 11:10:47 +02:00
artica f4ef0110b2 Auto-updated build strings. 2018-06-27 00:01:31 +02:00
slerena 415f23ea14 Merge branch 'ent-2334-intracom-snmp-trap-forwarding-improvement' into 'develop' 
Recover critical status the SNMPTrap on SNMP console actions

See merge request artica/pandorafms!1567
 2018-06-26 22:40:02 +02:00
slerena b40770b944 Merge branch '2036-Cambiar-color-de-la-marca-de-Quiet' into 'develop' 
Image for mode Quiet changed to blue - #2036

See merge request artica/pandorafms!1573
 2018-06-26 22:37:50 +02:00
daniel 84f1cf95eb Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2018-06-26 13:44:16 +02:00
nramon 6ef2d537ec Merge branch '6005-No_cargan_las_graficas_individuales_en_vista_de_grafica_de_agente' into 'develop' 
fixed minor errors in graph remove avgOnly

See merge request artica/pandorafms!1574
 2018-06-26 13:36:11 +02:00
daniel 998eacc630 fixed minor errors in graph remove avgOnly 2018-06-26 13:26:37 +02:00
daniel 76cd718262 add cps for agent, module, policies and bulk opertaion 2018-06-26 13:23:12 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
artica b1b486143f Auto-updated build strings. 2018-06-26 00:01:30 +02:00
slerena c0cd577fb4 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop' 
Fixed bug in pandorafms

See merge request artica/pandorafms!1523
 2018-06-25 19:05:26 +02:00
slerena 40d7ef4fcb Merge branch 'ent-2281-5786-paratus-crear-modulos-snmp-proc-con-la-api' into 'develop' 
Modified set create_snmp_module to permit create remote_snmp_proc modules

See merge request artica/pandorafms!1563
 2018-06-25 19:04:49 +02:00
slerena 7c7f593425 Merge branch '2357-Problema-side-menu' into 'develop' 
Fixed submenu2 in functions_menu.php

See merge request artica/pandorafms!1533
 2018-06-25 19:03:11 +02:00
slerena 0520fba0f8 Merge branch '2330-No-funciona-seleccionar-todos-los-objetos-en-plantillas-de-módulos' into 'develop' 
Fixed checkbox select in manage_network_templates.php

See merge request artica/pandorafms!1516
 2018-06-25 19:02:48 +02:00