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

17957 Commits

Author SHA1 Message Date
fermin831 e54e91cdf1 Revert "Improved metaconsole sync (added centralized management)" 
This reverts commit 3c99242508.
 2018-08-17 13:27:55 +02:00
vgilc e1a3eaf236 Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop' 
Fixed the incremental realtime charts

See merge request artica/pandorafms!1695
 2018-08-17 13:23:23 +02:00
Alejandro Gallardo Escobar 5934f141a8 Fixed the incremental realtime charts 2018-08-17 13:17:27 +02:00
vgilc 5f658d92c8 Merge branch 'ent-2656-I6320-no-funciona-modo-Advance-LDAP-con-autocreacion-de-usuarios' into 'develop' 
Fixed several attributes in a ldap configuration

See merge request artica/pandorafms!1694
 2018-08-17 11:44:51 +02:00
fermin831 e687ca03bf Fixed several attributes in a ldap configuration 2018-08-17 11:29:19 +02:00
vgilc e78fc93f17 Merge branch 'ent-2335-gis-group-items' into 'develop' 
Grupos como elementos de mapa GIS

See merge request artica/pandorafms!1693
 2018-08-17 11:22:35 +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
vgilc 3ff740998c Merge branch 'fix-leap-year-calculation' into 'develop' 
Fixed month_have_days(), wrong calculation for leap year.

See merge request artica/pandorafms!1692
 2018-08-17 08:24:33 +02:00
Junichi Satoh a46b39a764 Fixed month_have_days(), wrong calculation for leap year. 2018-08-17 13:33:12 +09:00
artica 839a91b0ac Auto-updated build strings. 2018-08-17 00:01:25 +02:00
vgilc 51a6af5ff1 Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios-3' into 'develop' 
[Secondary groups] Fixed modules edition problems

See merge request artica/pandorafms!1691
 2018-08-16 15:03:20 +02:00
fermin831 df46772733 [Secondary groups] Fixed modules edition problems 2018-08-16 14:55:48 +02:00
vgilc 9433c9ddd1 Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios-2' into 'develop' 
Fixed overwrite primery group if user has no permissions for this group on update agent

See merge request artica/pandorafms!1690
 2018-08-16 12:55:55 +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 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