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

18156 Commits

Author SHA1 Message Date
vgilc e0eb6a3eff Merge branch '1920_Informe_de_alertas_3' into 'develop' 
Fixed minor error module/agent/group alert report

See merge request artica/pandorafms!1775
 2018-09-18 10:15:50 +02:00
samucarc 7100aed448 Fixed minor error module/agent/group alert report 2018-09-18 10:09:11 +02:00
vgilc 3a15c5844d Merge branch '2742-Cambiar_vista_manage_agent_group_tree' into 'develop' 
add new tree view edition group

See merge request artica/pandorafms!1773
 2018-09-18 09:49:24 +02:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
vgilc 9f0271c0b8 Merge branch '1920_Informe_de_alertas_2' into 'develop' 
Fixed module/agent/group alert report

See merge request artica/pandorafms!1772
 2018-09-18 08:37:03 +02:00
artica abc7e2cb3c Auto-updated build strings. 2018-09-18 00:01:27 +02:00
samucarc 8daca7d220 Fixed module/agent/group alert report 2018-09-17 18:57:29 +02:00
vgilc 14df5bafd7 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Bugfix

See merge request artica/pandorafms!1771
 2018-09-17 16:58:48 +02:00
Alejandro Gallardo Escobar 0fef339a13 Bugfix 2018-09-17 16:54:47 +02:00
vgilc 884c0deb3f Merge branch '1979-5352-plugin-de-monitorizacion-log-apache-dev' into 'develop' 
1979 5352 plugin de monitorizacion log apache dev

See merge request artica/pandorafms!1769
 2018-09-17 15:04:44 +02:00
vgilc 080cfb20ca Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2018-09-17 14:44:24 +02:00
danielmaya 50a3e43bd4 Insert apache log model in tlog_graph_models 2018-09-17 12:43:51 +02:00
artica 921a025262 Auto-updated build strings. 2018-09-17 00:01:24 +02:00
artica 4f6aff52c7 Auto-updated build strings. 2018-09-16 00:01:23 +02:00
artica 591db5001f Auto-updated build strings. 2018-09-15 00:01:24 +02:00
vgilc 59feccda72 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Añadidos textos de ayuda

See merge request artica/pandorafms!1767
 2018-09-14 11:52:59 +02:00
Alejandro Gallardo Escobar 1ac837a1b2 Improved the linked visual console status help 2018-09-14 11:40:28 +02:00
vgilc 2d1b9072ff Merge branch 'ent-2522-custom-fields-de-modulos-de-inventario-en-politicas' into 'develop' 
Added columns for a policy feature

See merge request artica/pandorafms!1763
 2018-09-14 10:54:39 +02:00
vgilc ddfb527668 Merge branch 'ent-2668-gis-visual-improvements' into 'develop' 
Minor visual improvements for the GIS views

See merge request artica/pandorafms!1764
 2018-09-14 08:24:32 +02:00
artica dff3fb7d0d Auto-updated build strings. 2018-09-14 00:01:27 +02:00
Alejandro Gallardo Escobar e9752e790e Added columns for a policy feature 2018-09-13 16:57:13 +02:00
vgilc c2b5133ff2 Merge branch '2742-Cambiar_vista_manage_agent_group' into 'develop' 
fixed view manage groups

See merge request artica/pandorafms!1761
 2018-09-13 16:44:05 +02:00
Alejandro Gallardo Escobar 8601e38eed Minor visual improvements for the GIS views 2018-09-13 16:38:17 +02:00
daniel 5d6f414d68 fixed view manage groups 2018-09-13 16:28:08 +02:00
vgilc d46cfab6db Merge branch 'ent-2301-fallo-mapas-de-red-consola-movil' into 'develop' 
Removed Networkmaps on mobile console

See merge request artica/pandorafms!1760
 2018-09-13 16:15:57 +02:00
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
fermin831 1096319faf Removed Networkmaps on mobile console 2018-09-13 15:48:26 +02:00
vgilc b39b876cb2 Merge branch 'ent-2353-seguridad-6' into 'develop' 
Generate session csrf code to avoid attacks in user edition

See merge request artica/pandorafms!1759
 2018-09-13 15:43:13 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
vgilc 87d1bdd29d Merge branch 'ent-2351-seguridad-4' into 'develop' 
Added .htaccess to avoid external access to attachment files

See merge request artica/pandorafms!1758
 2018-09-13 08:35:20 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00
vgilc d36a1c37f9 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-3' into 'develop' 
Fixed alerts_get_alerts function

See merge request artica/pandorafms!1757
 2018-09-12 17:44:56 +02:00
fermin831 52f89def20 Added .htaccess to avoid external access to attachment files 2018-09-12 17:30:13 +02:00
fermin831 a25d4ed166 Fixed alerts_get_alerts function 2018-09-12 17:27:09 +02:00
Alejandro Gallardo Escobar 7930f22dd0 WIP: Improved the linked visual console status help 2018-09-12 16:54:18 +02:00
Alejandro Gallardo Escobar 98b2907857 Bug fixes 2018-09-12 16:16:04 +02:00
vgilc a90f568287 Merge branch '2713-Valores_a_0_en_graficas' into 'develop' 
fixed minor error legend graph and value avg

See merge request artica/pandorafms!1756
 2018-09-12 16:01:49 +02:00
daniel c5b942f13f fixed minor error legend graph and value avg 2018-09-12 15:57:22 +02:00
vgilc 55de76542b Merge branch 'ent-2350-seguridad-3' into 'develop' 
Fixed security fail filling the plugin fields

See merge request artica/pandorafms!1755
 2018-09-12 15:12:01 +02:00
fermin831 0ec93011da Fixed security fail filling the plugin fields 2018-09-12 15:05:30 +02:00
vgilc e202ab1f7e Merge branch '1986-Informes-infinitos2' into 'develop' 
Deleted reports from cron

See merge request artica/pandorafms!1754
 2018-09-12 14:49:44 +02:00
manuel.montes a2b3d6e07f Deleted reports from cron 2018-09-12 13:43:23 +02:00
vgilc 5894454387 Merge branch 'ent-1754-anadir-soporte-HTTPS-en-la-configuracion-de-la-API-pandora_server-conf' into 'develop' 
Added no verify ssl in server daemon

See merge request artica/pandorafms!1753
 2018-09-12 13:31:52 +02:00
fermin831 861e25fe43 Added no verify ssl in server daemon 2018-09-12 13:20:46 +02:00
vgilc 8622fc2738 Merge branch '2550-Las_graficas_no_se_muestran_bien_en_Dashboard' into 'develop' 
fixed minor error refresh graph pie

See merge request artica/pandorafms!1752
 2018-09-12 11:27:39 +02:00
daniel b0257eb3f4 fixed minor error refresh graph pie 2018-09-12 11:23:26 +02:00
vgilc ec0640083a Merge branch '2487-Cambiar_forma_de_captura_de_datos_de_graficas_forecast_y_baseline_2' into 'develop' 
2487 cambiar forma de captura de datos de graficas forecast y baseline 2

See merge request artica/pandorafms!1751
 2018-09-12 10:38:04 +02:00
daniel 6312d2e38a fixed forecast report 2018-09-12 10:34:14 +02:00
vgilc 1bdfaed293 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-2' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios 2

See merge request artica/pandorafms!1750
 2018-09-12 10:21:09 +02:00
fermin831 006b086366 [Secondary groups] Fixed tgroup_stat calculation and improve performance. 2018-09-12 09:07:29 +02:00