14442 Commits

Author SHA1 Message Date
artica
0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica
37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica
37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
Arturo Gonzalez
a2cff4195f Added code to autocomplete with ux transactions 2017-04-21 14:32:31 +02:00
artica
f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
Arturo Gonzalez
b10f1f422f Added more restrictions to user dashboard function 2017-04-20 18:02:34 +02:00
Arturo Gonzalez
87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez
82530c9b59 Added external query to mr 2017-04-20 16:18:37 +02:00
Arturo Gonzalez
5b015dbcb9 Added new icon to meta mail setup and change mail message 2017-04-20 16:11:45 +02:00
Arturo Gonzalez
d93fa1bb3f Added new option to enable and disable reset pass 2017-04-20 15:31:39 +02:00
Arturo Gonzalez
14a3a79eb3 Changed cod type 2017-04-20 15:00:24 +02:00
vanessa gil
c3ccb00b2a new file. 2017-04-20 13:36:03 +02:00
vgilc
11b7212380 Merge branch 'changes-in-ntwrkmap-dev' into 'develop'
Added nodes regeneration in map group updates

See merge request !388
2017-04-20 13:28:55 +02:00
Arturo Gonzalez
4c07fe5d3f Added nodes regeneration in map group updates 2017-04-20 13:18:55 +02:00
Arturo Gonzalez
ad065e2464 Changed cron help message 2017-04-20 12:56:22 +02:00
Arturo Gonzalez
63254ac7e4 Move mail setup section to enterprise setup 2017-04-20 12:54:15 +02:00
vgilc
868f84f3c4 Merge branch '126-problemas-en-el-visor-de-eventos-android' into 'develop'
Moved the project to the new Android Studio and bugfixes

Closes #126

See merge request !387
2017-04-20 12:45:25 +02:00
Arturo Gonzalez
bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Alejandro Gallardo Escobar
363b781aef Moved the project to the new Android Studio and bugfixes
Fixed the error which caused the agent name was replaced by the event source when using Pandora FMS >v5.
Improvements on some horrible old code.
2017-04-20 12:21:29 +02:00
Arturo Gonzalez
a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
m-lopez-f
fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
Arturo Gonzalez
df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez
e26dfcd466 Move code to enterprise section 2017-04-20 11:18:43 +02:00
Arturo Gonzalez
727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
artica
dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
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 dc97c29198fdad6428346ff0f3d30193bb554331)
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