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

6502 Commits

Author SHA1 Message Date
Daniel Maya a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop' 
Feature/alias friendly name

See merge request !188
 2017-02-21 16:46:05 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
daniel 63d582586b Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop' 
fixed error in ldap create new users

See merge request !186
 2017-02-21 15:55:51 +01:00
Daniel Maya c21bbfd88c Merge branch 'feature/alias_friendly_name' of https://192.168.50.5:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-21 15:31:45 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 430ae3e201 Merge branch 'develop' into feature/alias_friendly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-21 15:23:44 +01:00
daniel a5055ec27a fixed error in ldap create new users 2017-02-21 14:04:53 +01:00
Alejandro Gallardo Escobar 0daaa9651e Changed the agent name by its alias 2017-02-21 14:04:43 +01:00
daniel df0a6086c4 fixed minor error in report availavility 2017-02-21 13:56:00 +01:00
m-lopez-f a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +01:00
Enrique Camargo 32806a5538 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop' 
Improve custom graph interface - #66

See merge request !179
 2017-02-21 12:39:01 +01:00
enriquecd 48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
Arturo Gonzalez 5190228010 Merge branch 'develop' into feature/log_in_reports 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting_html.php
 2017-02-21 12:06:24 +01:00
m-lopez-f 09e1b8ce1c Fixed problems with src images in visual consoles. Gitlab: #255 2017-02-21 10:28:19 +01:00
fermin 59135bb1b1 Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop' 
Updated eHorus client

See merge request !176
 2017-02-21 10:23:29 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 51955d5bea Changed the agent name by its alias 2017-02-20 20:02:39 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Alejandro Gallardo Escobar e53d75d98d Added a function to get the agent alias using a module id 2017-02-20 18:50:28 +01:00
fermin831 7592bce0a9 Updated eHorus client 2017-02-20 18:25:46 +01:00
Alejandro Gallardo Escobar 354377a56a Changed the agent name by its alias 2017-02-20 17:28:38 +01:00
daniel 5c32d0ba95 Merge branch '267-vista-agente-modulo-con-filtros-no-visualiza-datos-open' into 'develop' 
fixed errors in agent/module

See merge request !175
 2017-02-20 17:26:14 +01:00
Arturo Gonzalez 03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
daniel 65047c23a5 fixed errors in agent/module 2017-02-20 16:16:53 +01:00
Alejandro Gallardo Escobar 550a00cec7 Changed the agent name by its alias 2017-02-20 15:32:49 +01:00
Alejandro Gallardo Escobar c49df7c60d Added a function to get the agent alias 2017-02-20 15:32:10 +01:00
m-lopez-f 2c1e43a477 Re-fixed problems with agents name in visual consoles 2017-02-20 14:38:58 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
daniel 40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Arturo Gonzalez f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
artica f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica 2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica 1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
m-lopez-f e3c3fafa43 Fixed problems with agent name in visual consoles. Gitlab #257 2017-02-17 15:39:28 +01:00
m-lopez-f 699942eef5 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-17 13:34:39 +01:00
m-lopez-f e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +01:00
Enrique Camargo 8ad2c2f35f Merge branch '63-la-consola-visual-en-pantalla-completa-se-come-un-trozo-por-arriba' into 'develop' 
Visual console in fullscreen does not allow see complete background if is bigger than screen - #63

See merge request !168
 2017-02-17 13:23:43 +01:00
Arturo Gonzalez 294cb5a14f Revert "Added data precision to events table. Ticket #288" 
This reverts commit f6f5d64d32.
 2017-02-17 13:15:28 +01:00
enriquecd d7b24fc9c9 Visual console in fullscreen does not allow see complete background if is bigger than screen - #63 2017-02-17 13:04:21 +01:00
Arturo Gonzalez f6f5d64d32 Added data precision to events table. Ticket #288 2017-02-17 12:16:33 +01:00
Daniel Maya 3051ce4e23 Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-17 10:11:59 +01:00
artica 0677a62be0 Auto-updated build strings. 2017-02-17 00:01:17 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
daniel cfb7a3a88e fixed tabs in reports 2017-02-16 15:40:56 +01:00
Arturo Gonzalez 928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +01:00
fbsanchez 27744031ce Fixed thresholds SLA 
fixed dynamic calculation while the thresholds are disabled.
 2017-02-16 12:29:31 +01:00
fbsanchez 9ddee676b6 Minor fix: inherit mysqli from config 2017-02-16 11:35:26 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Junichi Satoh fdb19d309d Updated japanese translations. 2017-02-16 18:22:30 +09:00