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

15320 Commits

Author SHA1 Message Date
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00
Daniel Maya 06eadbaf81 Fixed urlencode in event popup 2017-07-19 10:52:01 +02:00
Arturo Gonzalez 1ff3202c43 Added the last things to the new vc item (module events) 2017-07-19 10:36:24 +02:00
vgilc ef0e6a2093 Merge branch '713-Asignar-políticas-a-grupos-dev' into 'develop' 
713 asignar políticas a grupos dev

See merge request !667
 2017-07-19 09:55:10 +02:00
artica b8b6937284 Auto-updated build strings. 2017-07-19 00:01:16 +02:00
vgilc d36fef16c0 Merge branch 'ent-1050-el-instalador-de-tarball-del-agente-no-lo-para-despues-de-desinstalar' into 'develop' 
Stop agent on uninstall tarball

See merge request !673
 2017-07-18 18:34:57 +02:00
fermin831 1c059f5afc Stop agent on uninstall tarball 2017-07-18 17:28:26 +02:00
vgilc fb1e51301d Merge branch '1008-fallo-del-instalador-de-debian-del-agente-de-pandora' into 'develop' 
Avoid to launch postinst script on Debian remove fail

See merge request !671
 2017-07-18 17:15:50 +02:00
fermin831 4da7b08f84 Avoid to launch postinst script on Debian remove fail 2017-07-18 16:23:45 +02:00
vgilc 97cfe0260a Merge branch '815-modify-debug-text-line-in-pandora_agent.conf-files-dev' into 'develop' 
Added new comment to debug in conf

See merge request !669
 2017-07-18 13:44:25 +02:00
Arturo Gonzalez a331de63eb Added new comment to debug in conf 2017-07-18 13:31:50 +02:00
Daniel Maya d29aa2c246 Fixed email column 2017-07-18 13:07:25 +02:00
Arturo Gonzalez 329050b02b Fixed error 2017-07-18 12:26:29 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +02:00
Arturo Gonzalez d594b98cc3 Added recover delimiter 2017-07-18 11:48:59 +02:00
Arturo Gonzalez bec023dc4d Fixed meta event table in cli and api functions 2017-07-18 11:36:57 +02:00
artica d65ad2693e Auto-updated build strings. 2017-07-18 00:01:17 +02:00
vgilc e56eac3648 Merge branch 'MR4-1015' into 'develop' 
Set texport_server table name field varchar 600 - #1015

See merge request !664
 2017-07-17 17:05:00 +02:00
vgilc 393a1e2ee0 Merge branch '815-update-conf-info-about-debug-mode-dev' into 'develop' 
Changed conf description

See merge request !663
 2017-07-17 17:03:42 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
enriquecd 4aa04cfef0 Set texport_server table name field varchar 600 - #1015 2017-07-17 16:19:38 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop' 
Change tserver_export_data to varchar 600 - #1015

See merge request !600
 2017-07-17 15:41:45 +02:00
Arturo Gonzalez dd6e4a3bd8 Changed conf description 2017-07-17 11:26:22 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +02:00
vgilc cdb00253b6 Merge branch '1131-create-MR-number-4-dev' into 'develop' 
Added db changes to package 708

See merge request !662
 2017-07-17 10:51:42 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
Daniel Maya c13644951f update agent 2017-07-17 09:22:28 +02:00
artica 3fb887f516 Auto-updated build strings. 2017-07-17 00:01:15 +02:00
artica c5c748c831 Auto-updated build strings. 2017-07-16 00:01:15 +02:00
artica 8f88f87203 Auto-updated build strings. 2017-07-15 00:01:15 +02:00
artica 65cbbd1bae Auto-updated build strings. 2017-07-14 00:01:19 +02:00
vgilc f8a1b77158 Merge branch '1115-Redimensiónde-los-iconos-y-texto-en-mapas-GIS' into 'develop' 
Hold mark labels font size when autorefresh and fix drag map font size bug - #1115

See merge request !660
 2017-07-13 17:16:49 +02:00
Arturo Gonzalez b4c31df636 Fixed module events graph in vc 2017-07-13 16:57:53 +02:00
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
vgilc 43a975141c Merge branch '719-Color-de-gráficas-en-widgets-dev' into 'develop' 
added graph colors in dahsboard

See merge request !563
 2017-07-13 15:30:21 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
vgilc 54b90c75fe Merge branch '1019-Editar-modulo-no-muestra-nombre' into 'develop' 
Fix module editor can not show name with quotes - #1019

See merge request !587
 2017-07-13 13:17:34 +02:00
vgilc f10e67342d Merge branch '844-Error-en-la-posición-al-crear-un-elemento-con-imagen-en-las-consolas-visuales' into 'develop' 
Fix image align when create a static graph in vconsole - #844

See merge request !642
 2017-07-13 13:15:26 +02:00
vgilc bb02b2307b Merge branch '1013-snmp-alert-dont-send-agent-alias-dev' into 'develop' 
Added alias to snmp alert agent object

See merge request !604
 2017-07-13 12:43:10 +02:00
Arturo Gonzalez 230c617c02 Merge branch 'develop' into 1013-snmp-alert-dont-send-agent-alias-dev 
pandora_server/lib/PandoraFMS/Core.pm
 2017-07-13 12:33:27 +02:00
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
vgilc c2c677de65 Merge branch '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' into 'develop' 
Changed agent name by alias

See merge request !590
 2017-07-13 12:11:18 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00
vgilc 38b42a26a2 Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop' 
845 mejoras en snmp browser dev

See merge request !602
 2017-07-13 12:07:46 +02:00
vgilc fb57ea216e Merge branch '997-Active-SNMP-filters-in-snmp-console-dev' into 'develop' 
Added active filters to snmp console

See merge request !611
 2017-07-13 12:02:39 +02:00
vgilc cc9191b676 Merge branch 'develop' into '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-07-13 11:59:19 +02:00