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

8850 Commits

Author SHA1 Message Date
artica 80cec1aadb Auto-updated build strings. 2018-08-23 00:01:29 +02:00
artica 99858d3371 Auto-updated build strings. 2018-08-22 00:01:27 +02:00
vgilc 281dbb4784 Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop' 
fixed error automatic combined graph

See merge request artica/pandorafms!1707
 2018-08-21 10:58:57 +02:00
daniel 8e845d2948 fixed error automatic combined graph 2018-08-21 10:54:36 +02:00
vgilc 69513fdc63 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario-3' into 'develop' 
Added secondary groups and no hierarchy documentation

See merge request artica/pandorafms!1700
 2018-08-21 08:34:53 +02:00
fermin831 4d44fcb512 Added secondary groups documentation 2018-08-21 08:27:46 +02:00
artica e518135adf Auto-updated build strings. 2018-08-21 00:01:24 +02:00
daniel fac1b3b616 fixed error for each agent report metaconsole 2018-08-20 17:28:14 +02:00
daniel 271466fb66 fixed errors automatic combined graph report metaconsole 2018-08-20 13:52:01 +02:00
vgilc 7b9fe9573e Merge branch 'ent-2335-gis-group-items' into 'develop' 
Bug fixes on the GIS map layer configuration

See merge request artica/pandorafms!1697
 2018-08-20 12:42:48 +02:00
artica ad6a3d69e8 Auto-updated build strings. 2018-08-20 00:01:20 +02:00
artica c79b06e43c Auto-updated build strings. 2018-08-19 00:01:22 +02:00
artica 693f9617ac Auto-updated build strings. 2018-08-18 00:01:26 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00
fermin831 e687ca03bf Fixed several attributes in a ldap configuration 2018-08-17 11:29:19 +02:00
Alejandro Gallardo Escobar 8a5495a283 Merge branch 'develop' into ent-2335-gis-group-items 2018-08-17 11:17:29 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
artica 839a91b0ac Auto-updated build strings. 2018-08-17 00:01:25 +02:00
fermin831 304a3b40c2 Fixed overwrite primery group if user has no permissions for this group on update agent 2018-08-16 12:48:44 +02:00
vgilc a4d1cfc9e6 Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop' 
2641 no se filtran eventos por grupo secundario en meta

See merge request artica/pandorafms!1688
 2018-08-16 11:03:02 +02:00
vgilc b8560fd597 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla-3' into 'develop' 
Removed unwanted safe input in a data display

See merge request artica/pandorafms!1689
 2018-08-16 10:06:11 +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
fermin831 024a1cc1ee Fixed snapshot view in metaconsole 2018-08-14 13:21:32 +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
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
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
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
fermin831 8be030b7da Fixed agents_get_agentmodule_group to search only in tagente table 2018-08-10 12:55:04 +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
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
artica 50b4c45652 Auto-updated build strings. 2018-08-09 00:01:24 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
fermin831 10a4268bbc Implemented no_hierarchy profile in users_et_groups function 2018-08-08 09:26:07 +02:00
artica c6eef38ae8 Auto-updated build strings. 2018-08-08 00:01:22 +02:00
Alejandro Gallardo Escobar 2778239a0f Fix the api info call 2018-08-07 13:03:53 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00