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

14467 Commits

Author SHA1 Message Date
Arturo Gonzalez 4a4f52c459 Added send mail function 2017-04-19 17:29:22 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
enriquecd b21b3cabf6 Not show scroll bar in config permission error dialog in index - #728 2017-04-19 15:10:55 +02:00
Arturo Gonzalez bd30625532 Added return to login button 2017-04-19 15:10:51 +02:00
Arturo Gonzalez 7011eee871 Added a new page to reset password, for now without code, only visual page and error control 2017-04-19 13:26:20 +02:00
vgilc 84e4dc1ee0 Merge branch '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open' into 'develop' 
Change strings in minor release update manager / open - #486

See merge request !296
 2017-04-19 11:51:17 +02:00
Enrique Camargo 6259a62095 Merge branch 'develop' into '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-04-19 11:39:57 +02:00
Ramon Novoa 25df1acfff Do not chmod +x pandora_server_installer. 
Running `chmod +x pandora_server_installer &&
./pandora_server_installer` inside a container causes an error when
using Docker's aufs storage driver.

(cherry picked from commit dc97c29198)
 2017-04-19 08:57:13 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
Arturo Gonzalez 8531e9847b Added lost id to dynamic threshold select 2017-04-18 17:46:50 +02:00
vgilc 6805dcf363 Merge branch '549-errores-en-dashboard-moviles' into 'develop' 
Fixed a typo error

See merge request !382
 2017-04-18 16:48:49 +02:00
m-lopez-f 3454490220 Fixed a typo error 2017-04-18 16:20:50 +02:00
vgilc f01639a34d Merge branch '404-conf-del-satelite-se-mete-en-dataserver' into 'develop' 
Fixed problems with remote config view files of conf about server and satellite.

See merge request !329
 2017-04-18 16:01:55 +02:00
vgilc 41e30eb39b Merge branch '546-widgets-de-dashboard-open' into 'develop' 
Resolve jquery library bug (holagram dashboard) - #546

See merge request !289
 2017-04-18 16:01:22 +02:00
vgilc 0d65afda8e Merge branch '549-errores-en-dashboard-moviles' into 'develop' 
Fixed styles of diferents graphs in dashboards when active mobile version.

See merge request !306
 2017-04-18 16:01:01 +02:00
vgilc 61e328afa7 Merge branch '579-se-pueden-crear-module-templates-vacías' into 'develop' 
Deleted white space when saving modules template

See merge request !314
 2017-04-18 16:00:44 +02:00
vgilc de97b5eeab Merge branch 'ent-671-fallo-en-el-migrate-de-la-6-a-la-7-en-tbackup' into 'develop' 
Drop addcol procedure if not exists

See merge request !374
 2017-04-18 15:55:35 +02:00
Daniel Maya 8f1d93c008 Support link changed in pandora enterprise 2017-04-18 11:46:57 +02:00
Arturo Gonzalez 29ad608ddb Added ; to query transaction 2017-04-18 11:41:51 +02:00
Arturo Gonzalez 97abef62c4 Added db field to mr 2017-04-18 11:39:46 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
Daniel Maya 42c7a400f0 Changed name by alias when deleting agent 2017-04-18 10:42:23 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
enriquecd 1348256d1a Change sec url string in message section - #684 /4 2017-04-17 19:30:44 +02:00
enriquecd ee128242bc Change sec url string in message and vconsole section - #688 - 2 2017-04-17 18:51:59 +02:00
Daniel Maya f13085ed3a Changed agent name by agent alias 2017-04-17 14:45:42 +02:00
fermin831 bf368a155b Drop addcol procedure if not exists 2017-04-17 13:25:36 +02:00
Daniel Maya 622edc1369 new feature: added agent_alias_cmd in pandora_agent 2017-04-17 12:50:46 +02:00
vgilc 86a4ca2a80 Merge branch '581-Error-en-custom-graphs' into 'develop' 
When there is no custom graph redirects to the graph list

See merge request !363
 2017-04-17 09:47:11 +02:00
vgilc 8caaed72c0 Merge branch '519-Today_button_in_planned_downtime_datepicker' into 'develop' 
Added buttonpanel to set today in planned downtime datepicker

See merge request !365
 2017-04-17 09:21:07 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
Arturo Gonzalez 23b9e7c08d Added checkbox to selet all items in report (to delete them) 2017-04-12 11:35:26 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
Ramon Novoa a2e42134f0 Do not crash if an interface does not have an IP address. 2017-04-11 18:10:46 +02:00
Arturo Gonzalez 055ab9040d Added buttonpanel to set today in planned downtime datepicker 2017-04-11 16:34:07 +02:00
Daniel Maya a81dcdcfc5 When there is no custom graph redirects to the graph list 2017-04-11 15:30:32 +02:00
nramon fc5635381a Merge branch '116-Remote_config-did-not-work-at-Pandora-Agent-for-Windows' into 'develop' 
Resolve "Remote_config did not work at Pandora Agent for Windows."

Closes #116

See merge request !357
 2017-04-11 12:29:08 +02:00
Ramon Novoa e492ea0334 Fix a typo in ifaces.vbs. 2017-04-11 12:27:27 +02:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
mlopez c316462802 Update public_console.php 2017-04-10 17:53:01 +02:00
m-lopez-f f8d3c8804e Gis Maps Feature: When scrolling in map, change font-size of labels. 2017-04-10 17:46:32 +02:00
Arturo Gonzalez 893707a024 Remove trace 2017-04-10 14:39:31 +02:00
Arturo Gonzalez 9cd99307dd Added selector in visual conf to select a csv divider 2017-04-10 13:58:42 +02:00
Hirofumi Kosaka ddf6919654 "agent_alias" could not work at Pandora Agent for Windows. #116 2017-04-10 18:27:34 +09:00
Hirofumi Kosaka ad05691e2d "remote_config" did not work at Pandora Agent for Windows. #116 2017-04-10 18:26:29 +09:00
Arturo Gonzalez 41b49770ee Added new ranges to graph period 2017-04-10 11:10:32 +02:00