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

18253 Commits

Author SHA1 Message Date
vgilc 855283421b Merge branch 'ent-2647-version-open-fallo-funcions-cps' into 'develop' 
Added missing enterprise_hook in get cps

See merge request artica/pandorafms!1683
 2018-08-16 09:47:04 +02:00
vgilc dc8020dbdc Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop' 
[Secondary groups] Fixed modules permissions in some views

See merge request artica/pandorafms!1669
 2018-08-16 09:46:28 +02:00
fermin831 a23dd89c70 Removed unwanted safe input in a data display 2018-08-16 09:24:59 +02:00
artica 7ac2745b9e Auto-updated build strings. 2018-08-16 00:01:21 +02:00
artica b222c6627a Auto-updated build strings. 2018-08-15 00:01:24 +02:00
fermin831 6372f44212 Added some docs 2018-08-14 17:08:00 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
artica e94af2ee15 Updated version and build strings. 2018-08-14 15:24:31 +02:00
vgilc 898154ccfb Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario-2' into 'develop' 
Fixed copy is_secondary to no_hierarchy in mr 19

See merge request artica/pandorafms!1687
 2018-08-14 14:41:10 +02:00
fermin831 4678c0df53 Fixed copy is_secondary to no_hierarchy in mr 19 2018-08-14 14:16:40 +02:00
vgilc 965a0fa8ce Merge branch '2043-fallos-en-la-visualizacion-de-snapshots-4' into 'develop' 
Fixed snapshot view in metaconsole

See merge request artica/pandorafms!1686
 2018-08-14 14:11:04 +02:00
fermin831 024a1cc1ee Fixed snapshot view in metaconsole 2018-08-14 13:21:32 +02:00
vgilc 20a3d6c3be Merge branch 'ent-2646-error-replicacion-de-eventos' into 'develop' 
Fixed replication events and update cache problems

See merge request artica/pandorafms!1685
 2018-08-14 12:39:20 +02:00
vgilc d85594a2ca Merge branch '2389-Ordenar-eventos-por-campo-3' into 'develop' 
Fixed pagination and added filter to All events

See merge request artica/pandorafms!1684
 2018-08-14 12:38:28 +02:00
fermin831 fb97c373ff Fixed replication events and update cache problems 2018-08-14 11:43:14 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
artica b8d8f20d64 Auto-updated build strings. 2018-08-14 00:01:24 +02:00
fermin831 54803de45d Added missing enterprise_hook in get cps 2018-08-13 16:43:01 +02:00
vgilc d31716713c Merge branch 'ent-2644-I6251-no-funciona-alertas-que-generan-eventos-en-Pandora-FMS-tras-rebranding' into 'develop' 
Fixed migration rebranding Event commands

See merge request artica/pandorafms!1682
 2018-08-13 15:12:58 +02:00
fermin831 3daea977b0 Fixed migration rebranding Event commands 2018-08-13 14:10:19 +02:00
vgilc 6b700d337a Merge branch '572-Extension-de-self-assestment' into 'develop' 
Extension self assestment

See merge request artica/pandorafms!1676
 2018-08-13 12:56:04 +02:00
fermin831 962e793c1b Reupload the manuel.montes changes 2018-08-13 12:52:01 +02:00
fermin831 837df1f196 Revert "Extension self assestment" 
This reverts commit de459c7761.
 2018-08-13 12:49:41 +02:00
vgilc fb367ae8a9 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla-2' into 'develop' 
Fixed text format in html historic data

See merge request artica/pandorafms!1681
 2018-08-13 12:45:45 +02:00
Alejandro Gallardo Escobar dd6b9aed81 Refactored the layer configuration of the GIS maps to fix some bugs 2018-08-13 12:42:30 +02:00
fermin831 a5ff91185b Fixed text format in html historic data 2018-08-13 12:41:09 +02:00
vgilc e0d558fbe6 Merge branch '2598-Error-de-permisos-en-acciones-de-alertas-dev-3' into 'develop' 
Fixed group all alert templates visualization

See merge request artica/pandorafms!1680
 2018-08-13 11:30:41 +02:00
fermin831 13ad7b4fc7 Fixed group all alert templates visualization 2018-08-13 11:24:32 +02:00
vgilc 3b6af4485f Merge branch '2573-Graficas_no_se_muestran_bien_Consola_visual-2' into 'develop' 
Fixed bullet charts (7 pixels for tickline)

See merge request artica/pandorafms!1679
 2018-08-13 11:09:34 +02:00
fermin831 9d4297356e Fixed bullet charts (7 pixels for tickline) 2018-08-13 10:59:38 +02:00
vgilc 9dd9ad71a8 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop' 
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario

See merge request artica/pandorafms!1665
 2018-08-13 10:28:14 +02:00
vgilc 9df412ca72 Merge branch '2415-plantillas-de-consola-visual-eu-comm' into 'develop' 
2415 plantillas de consola visual eu comm

See merge request artica/pandorafms!1677
 2018-08-13 08:21:16 +02:00
artica aba54d65fa Auto-updated build strings. 2018-08-13 00:01:21 +02:00
artica 29c8a54e57 Auto-updated build strings. 2018-08-12 00:01:24 +02:00
artica f6382725dd Auto-updated build strings. 2018-08-11 00:01:25 +02:00
fbsanchez 8f329698d0 Vconsole templates, fixed permissions 2018-08-10 18:16:31 +02:00
manuel.montes de459c7761 Extension self assestment 2018-08-10 17:56:43 +02:00
vgilc fd1811bee6 Merge branch 'ent-2620-no-se-puede-acceder-graficas-de-modulo-desde-la-meta' into 'develop' 
Fixed agents_get_agentmodule_group to search only in tagente table

See merge request artica/pandorafms!1675
 2018-08-10 13:10:14 +02:00
fermin831 8be030b7da Fixed agents_get_agentmodule_group to search only in tagente table 2018-08-10 12:55:04 +02:00
fbsanchez e18e2e0b6f Added locate_agent 2018-08-10 12:06:47 +02:00
fbsanchez 505ec5d283 Added methods to locate agent 2018-08-10 12:05:20 +02:00
vgilc 77825c7b2c Merge branch 'fix/pandora_enterprise#2593-server-signals' into 'develop' 
Check and restart server threads if necessary.

See merge request artica/pandorafms!1674
 2018-08-10 11:42:06 +02:00
Ramon Novoa 9a9956296f Check and restart server threads if necessary. 
Ref pandora_enterprise#2593.
 2018-08-10 11:35:27 +02:00
vgilc c6acf4abe2 Merge branch '572-extensionode-self-assestment' into 'develop' 
fix bug in pandora_diag.php

See merge request artica/pandorafms!1673
 2018-08-10 11:22:51 +02:00
vgilc 7515cc6529 Merge branch '2635-6317-graficas-combinadas' into 'develop' 
Added thresholds to comb/interface graphs

See merge request artica/pandorafms!1672
 2018-08-10 11:11:07 +02:00
manuel.montes bb8fc7a765 fix bug in pandora_diag.php 2018-08-10 10:41:18 +02:00
artica e1904878b5 Auto-updated build strings. 2018-08-10 00:01:24 +02:00
fbsanchez 6142fa1b05 Added thresholds to comb/interface graphs 2018-08-09 16:33:29 +02:00
vgilc 367a1e121f Merge branch '572-extensionode-self-assestment' into 'develop' 
572 extensionode self assestment

See merge request artica/pandorafms!1671
 2018-08-09 13:37:00 +02:00
manuel.montes 2c72ec54b8 Update self-assestment 2018-08-09 13:08:08 +02:00