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

14972 Commits

Author SHA1 Message Date
Arturo Gonzalez 836cc384e9 Added good colours to meta tactical events bar 2017-07-25 08:36:21 +02:00
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +02:00
Arturo Gonzalez 9ddb47741f Added new events bar to meta 2017-07-24 16:34:22 +02:00
vgilc bb8a8daddf Merge branch '663-Anadir_algun_tipo_de_elemento_o_icono_para_saber_cuando_es_un_agente_de_red,_satelite_o_software' into 'develop' 
add new field table view agents for type of agent

See merge request !689
 2017-07-24 15:59:48 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
vgilc 65a1ebae77 Merge branch '375_Agente_xml_buffer_y_modo_secundario_always' into 'develop' 
fixed errors in agent buffered always

See merge request !686
 2017-07-24 11:11:01 +02:00
Ramon Novoa 17229cbcd7 Add a script to count .data files by agent. 2017-07-24 11:09:41 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00
artica c51cf9774f Auto-updated build strings. 2017-07-23 00:01:13 +02:00
artica b5caec31b5 Auto-updated build strings. 2017-07-22 00:01:45 +02:00
enriquecd 75a9a41a0b Add report info option in metaconsole 7 open - #1085 2017-07-21 14:57:03 +02:00
daniel aa5d18ff3f fixed errors in agent buffered always 2017-07-21 14:45:23 +02:00
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +02:00
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +02:00
vgilc 74f3c15f91 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes-open-u-2' into 'develop' 
Fix labels - #1088

See merge request !684
 2017-07-20 15:58:57 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
vgilc 4185cc6687 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes-open-u' into 'develop' 
1088 macros en automatic combined graph plantillas de informes open u

See merge request !683
 2017-07-20 15:34:03 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +02:00
daniel 66d9dd9d27 fixed errors entities in mail 2017-07-20 13:36:16 +02:00
vgilc 8971560f5d Merge branch '412-consola-visual-Módulo-imagen-2-size' into 'develop' 
Fix restore element width when press double click over data image simple_value - #412

See merge request !681
 2017-07-20 09:42:31 +02:00
artica 728fb7cc69 Auto-updated build strings. 2017-07-20 00:01:18 +02:00
enriquecd 31a8995176 Fix restore element width when press double click over data image simple_value - #412 2017-07-19 19:02:20 +02:00
Daniel Maya 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +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
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
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