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

16092 Commits

Author SHA1 Message Date
vgilc e7fd532aa3 Merge branch '1351-mala-ruta-en-icono-de-borrado-en-filtros-snmp-dev' into 'develop' 
Added good relative path

See merge request artica/pandorafms!1149
 2017-12-01 13:21:29 +01:00
Arturo Gonzalez f96e8277a0 Added good relative path 2017-12-01 12:53:16 +01:00
vgilc 1949ee653b Merge branch '1540-ayuda-general-en-mapas-de-red-dev' into 'develop' 
1540 ayuda general en mapas de red dev

See merge request artica/pandorafms!1144
 2017-12-01 11:21:37 +01:00
Arturo Gonzalez d1f198b80b Added new networkmaps help section 2017-12-01 11:16:09 +01:00
vgilc f84cfa2a86 Merge branch '1538-estilo-deshabilitado-en-nuevos-campos-de-graphviz-dev' into 'develop' 
Added disabled style

See merge request artica/pandorafms!1143
 2017-12-01 10:58:21 +01:00
vgilc 46737798ba Merge branch '1351-filtros-snmp-fallo-en-texto-dev' into 'develop' 
Changed text

See merge request artica/pandorafms!1142
 2017-12-01 10:57:09 +01:00
Arturo Gonzalez cd7b5b68b6 Added disabled style 2017-12-01 10:14:08 +01:00
vgilc 75c8b1ae8f Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop' 
Added fix to reset map function

See merge request artica/pandorafms!1140
 2017-12-01 09:31:21 +01:00
Arturo Gonzalez edd648de29 Changed text 2017-12-01 09:10:20 +01:00
vgilc 35ba173b88 Merge branch '1664-al-editar-un-radial-dinamic-pierde-el-tipo-dev' into 'develop' 
Fixed update map

See merge request artica/pandorafms!1141
 2017-12-01 09:04:30 +01:00
vgilc 54f0f9130b Merge branch '1622-mapas-dinamicos-radiales-errores-varios-dev' into 'develop' 
Added more changes to improve radial dynamic maps

See merge request artica/pandorafms!1136
 2017-12-01 09:00:27 +01:00
artica 4652980457 Auto-updated build strings. 2017-12-01 00:01:11 +01:00
Arturo Gonzalez 031196782b Fixed update map 2017-11-30 16:50:10 +01:00
slerena 7ac6aefc2d Merge branch '1483-Cuadro_de_umbrales' into 'develop' 
fixed error d3 in firefox

See merge request artica/pandorafms!946
 2017-11-30 16:40:58 +01:00
daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales 
Conflicts:
	pandora_console/godmode/agentes/module_manager_editor_common.php
	pandora_console/godmode/modules/manage_network_components_form_common.php
 2017-11-30 16:29:00 +01:00
nramon 9809efd6f3 Merge branch '1630-Lentitud_en_vista_de_eventos_con_muchos_grupos' into 'develop' 
optimization view events

See merge request artica/pandorafms!1139
 2017-11-30 16:12:14 +01:00
Arturo Gonzalez 92d054695d Added fix to reset map function 2017-11-30 16:00:32 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
nramon ac06725d99 Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop' 
Apply db changes to hide no data field event template reports - #1326

See merge request artica/pandorafms!941
 2017-11-30 13:31:48 +01:00
nramon 34be6f88cd Merge branch '1526-grep_syslog_module' into 'develop' 
1526 grep syslog module

See merge request artica/pandorafms!1138
 2017-11-30 13:24:36 +01:00
Ramon Novoa c72f583f0a Merge remote-tracking branch 'origin/develop' into 1526-grep_syslog_module 2017-11-30 13:20:51 +01:00
nramon cf32b4163c Merge branch '1326/1382-MR-db-changes' into 'develop' 
1326 / 1382 - Mr 10 changes

See merge request artica/pandorafms!1137
 2017-11-30 13:12:41 +01:00
nramon 3390dc7c24 Merge branch '1382-Ordenar-elementos-custom-graphs-4606-db' into 'develop' 
Db changes for tgraph_source field order - #1382

See merge request artica/pandorafms!965
 2017-11-30 13:12:31 +01:00
nramon cf01084873 Merge branch '1382-Ordenar-elementos-custom-graphs-4606' into 'develop' 
Add order items setting bar to graph editor - #1382

See merge request artica/pandorafms!961
 2017-11-30 13:12:25 +01:00
nramon c7676d7f4a Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open' into 'develop' 
Add hide no data item checkbox to report templates - open - #1326

See merge request artica/pandorafms!940
 2017-11-30 12:57:59 +01:00
enriquecd 688736288c Change treport_content_template fileds order - #1326 2017-11-30 12:46:29 +01:00
slerena f820a1db94 Merge branch 'Ordenar-en-seccion-user-dev' into 'develop' 
Fixed last contact in metaconsole users_setup

See merge request artica/pandorafms!1134
 2017-11-30 12:37:19 +01:00
enriquecd 097bc39d74 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2017-11-30 12:28:21 +01:00
nramon 274fa38e23 Merge branch '1242-Unificar-ayudas-de-alertas' into 'develop' 
Change alert macros help texts and translations - #1242

See merge request artica/pandorafms!981
 2017-11-30 12:27:01 +01:00
enriquecd 628d5d2c62 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open 2017-11-30 12:09:53 +01:00
enriquecd 6075c9b6b9 1326 / 1382 - Mr 10 changes 2017-11-30 11:55:11 +01:00
enriquecd 4f3f2525e1 Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas 
Conflicts:
	pandora_console/include/help/en/help_alert_config.php
	pandora_console/include/help/en/help_alert_macros.php
	pandora_console/include/help/es/help_alert_config.php
	pandora_console/include/help/es/help_alert_macros.php
 2017-11-30 11:47:47 +01:00
Arturo Gonzalez 30c879b600 Added more changes to improve radial dynamic maps 2017-11-30 10:45:28 +01:00
Arturo Gonzalez fbab43b451 In progress 2017-11-30 08:04:56 +01:00
artica d8ee188b95 Auto-updated build strings. 2017-11-30 00:01:12 +01:00
vgilc 13369ddab4 Merge branch 'redeclare-agents_get_agent_id_by_alias-dev' into 'develop' 
Fixed redeclare function

See merge request artica/pandorafms!1135
 2017-11-29 18:17:08 +01:00
danielmaya 3adb990970 Fixed redeclare function 2017-11-29 18:11:40 +01:00
danielmaya aeb3e73221 Fixed last contact in metaconsole users_setup 2017-11-29 17:42:57 +01:00
vgilc 227eb2b9cb Merge branch '1465-optimizacion-en-el-procesado-de-xml' into 'develop' 
Performance improvements. Rewrote safe_input and safe_output.

See merge request artica/pandorafms!925
 2017-11-29 17:08:03 +01:00
vgilc 2531e43d4a Merge branch '1263-Mensajes-de-Visor-de-logs-del-sistema' into 'develop' 
Change phrases in system logfile viewer - #1263

See merge request artica/pandorafms!968
 2017-11-29 17:03:42 +01:00
vgilc 7947a1797c Merge branch 'consola-visual-muestra-entities-en-el-textarea-donde-muestra-el-ultimo-evento-que-hace-saltar-la-consola' into 'develop' 
Fixed the HTML entities problem of the sound events view

See merge request artica/pandorafms!953
 2017-11-29 17:02:50 +01:00
vgilc 3a4ed1671b Merge branch '1410-Traducción-en-filtro-de-Alertas' into 'develop' 
Change manage alerts list enabled / disabled select text - #1410

See merge request artica/pandorafms!973
 2017-11-29 16:59:57 +01:00
vgilc 0e4c17cf1e Merge branch '1412-Filtro-por-más-campos-en-Manage-agents-2' into 'develop' 
Add new fields to filter in search input text and operative selector filter - #1412

See merge request artica/pandorafms!972
 2017-11-29 16:59:27 +01:00
vgilc 43308596c1 Merge branch '1490-Añadir-un-nuevo-campo-de-búsqueda-en-vista-de-agentes-dev' into 'develop' 
added Search in custom fields

See merge request artica/pandorafms!969
 2017-11-29 16:57:32 +01:00
vgilc df5722e499 Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop' 
Change font family to install wizard button - #1500

See merge request artica/pandorafms!964
 2017-11-29 16:57:03 +01:00
vgilc 93c0ddfad4 Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop' 
Removed last value on visual console boolean static graphs

See merge request artica/pandorafms!1053
 2017-11-29 16:56:36 +01:00
vgilc dad457b4d6 Merge branch 'ent-621-automonitorizacion-del-servidor-usa-comandos-de-otro-sistema-operativo' into 'develop' 
Fixed automonitoring on Windows

See merge request artica/pandorafms!971
 2017-11-29 16:56:10 +01:00
vgilc b0eb815e8e Merge branch '1224-No_funciona_el_boton_de_restablecer_campos_por_defecto_en_el_configurador_de_columnas_del_visor_de_eventos' into 'develop' 
fixed error in event fields

See merge request artica/pandorafms!935
 2017-11-29 16:55:48 +01:00
vgilc 66d15f3e4f Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop' 
Added autodisable mode help

See merge request artica/pandorafms!976
 2017-11-29 16:55:24 +01:00
vgilc 55e93d8fc9 Merge branch 'ent-1418-error-cuando-mysql-no-esta-levantado' into 'develop' 
Fixed console error 500 when mysql is not running

See merge request artica/pandorafms!959
 2017-11-29 16:54:58 +01:00