tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,475 Commits 34 Branches 30 Tags
Commit Graph

13475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alejandro Gallardo Escobar
c49df7c60d Added a function to get the agent alias 2017-02-20 15:32:10 +01:00
Alejandro Gallardo Escobar
545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +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 f6f5d64d32884a5b8c43cabc52ebc349baf47dfb.
 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
f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
Enrique Camargo
8bc12f02d0 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop' 
Insert newline between module first and agent first in module massive op - #62

See merge request !166
 2017-02-17 12:24:21 +01:00
Arturo Gonzalez
f6f5d64d32 Added data precision to events table. Ticket #288 2017-02-17 12:16:33 +01:00
enriquecd
87e8088c92 Insert newline between module first and agent first in module massive op - #62 2017-02-17 12:08:07 +01:00
Ramon Novoa
fb36235e6f Update a URL to point to updatemanager7. 2017-02-17 11:57:05 +01:00
Arturo Gonzalez
7452fe5dda Added missing value in tagente. 2017-02-17 11:06:21 +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
Enrique Camargo
d4ea02d75d Merge branch '61-no-puedo-crear-usuarios-ver-pantalla' into 'develop' 
Add session_time column to tusuario table - #61

See merge request !164
 2017-02-16 17:46:36 +01:00
enriquecd
c8c79e6fec Add session_time column to tusuario table - #61 2017-02-16 17:33:17 +01:00
daniel
b24b648151 fixed minor errors in tab reports 2017-02-16 16:16:45 +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
Arturo Gonzalez
66cd74abbe Removed top blank space in visual console. Ticket #274 2017-02-16 15:55:08 +01:00
daniel
e0537184ac Merge branch '58-tab-de-la-seccion-reporting-en-todas-las-secciones' into 'develop' 
fixed tabs in reports

See merge request !162
 2017-02-16 15:52:52 +01:00
daniel
cfb7a3a88e fixed tabs in reports 2017-02-16 15:40:56 +01:00
daniel
8e8b9a12c1 Merge branch '57-bug-en-interfaz-de-base-de-datos' into 'develop' 
fixed error in dbmanager

See merge request !161
 2017-02-16 15:15:12 +01:00
Arturo Gonzalez
928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +01:00
daniel
c7fce2d670 fixed error in dbmanager 2017-02-16 15:02:36 +01:00
fbsanchez
27744031ce Fixed thresholds SLA 
fixed dynamic calculation while the thresholds are disabled.
 2017-02-16 12:29:31 +01:00
Ramon Novoa
9fef698df4 Do not add module_parent to extended_info. 2017-02-16 11:44:02 +01:00
fbsanchez
9ddee676b6 Minor fix: inherit mysqli from config 2017-02-16 11:35:26 +01:00
daniel
b96f0290df Merge branch '56-graficas-varios-problemas' into 'develop' 
fixed errors in graphs

See merge request !159
 2017-02-16 11:26:16 +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
fbsanchez
8a2bd0f087 Fixed mysqli availability checker 2017-02-16 10:18:08 +01:00
Arturo Gonzalez
8dbd12eac7 Changed default value to service label font size. Ticket #218 2017-02-16 10:09:05 +01:00
Arturo Gonzalez
24defd473d Fixed grid position problem in visual consoles. Ticket #256 2017-02-16 09:57:58 +01:00
m-lopez-f
71bfbf76d9 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-16 08:38:27 +01:00
m-lopez-f
483c64a888 Add lost updates of files in mobile version #148 2017-02-16 08:37:36 +01:00
artica
96b160adc2 Auto-updated build strings. 2017-02-16 00:01:14 +01:00
nramon
97f5254956 Merge branch '253-bit-de-licencia-ux-para-pandora-7' into 'develop' 
Update the Update Manager URLs.

See merge request !157
 2017-02-15 16:10:07 +01:00
nramon
165b59656e Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
 2017-02-15 15:49:16 +01:00
Ramon Novoa
de392d26ad Update the Update Manager URLs. 2017-02-15 15:41:54 +01:00
m-lopez-f
68bdcdd74f Fixed typo error 2017-02-15 13:43:15 +01:00
m-lopez-f
b43f2cb433 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-15 13:42:48 +01:00
m-lopez-f
af65ec1910 Disable default extension Matrix, Vna and SSH. Gitlab: #251, #259 2017-02-15 13:42:40 +01:00
Arturo Gonzalez
5cce7ac2d0 Fixed interface links editor in networkmaps. Ticket #260 2017-02-15 10:29:45 +01:00
daniel
cb8fea7f2e fixed minor errors warnings in log 2017-02-15 08:52:57 +01:00
artica
7e7713ae04 Auto-updated build strings. 2017-02-15 00:01:14 +01:00
daniel
0eab9f1eaf Merge branch '55-warning-al-crear-o-editar-un-grupo-integria-4460' into 'develop' 
fixed minor errors and no show warnning in console to create agent groups

See merge request !154
 2017-02-14 16:00:48 +01:00
daniel
fb4cc26193 fixed minor errors and no show warnning in console to create agent groups 2017-02-14 15:47:12 +01:00
Arturo Gonzalez
c6dbf7c3b5 Added some modifications to node links. Ticket #260 2017-02-14 12:40:57 +01:00
Arturo Gonzalez
0c4f90d252 Node details improvements. Ticket #78 References ticket(s): #78 2017-02-14 09:52:11 +01:00