14190 Commits

Author SHA1 Message Date
daniel
f6290d25fa fixed error cli pandora-create_data_module 2017-04-25 13:48:17 +02:00
vgilc
ed2597fab7 Merge branch 'Borrado-1.sql-dev' into 'develop'
deleted 1.sql

See merge request !403
2017-04-25 10:42:26 +02:00
Daniel Maya
bd5cda07c4 deleted 1.sql 2017-04-25 10:28:46 +02:00
artica
d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
vgilc
d43de4f8ec Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales-2' into 'develop'
Change left margin in pie float - #99

See merge request !401
2017-04-24 17:44:41 +02:00
enriquecd
f2d52e80b6 Chango left margin in pie float - #99 2017-04-24 17:29:13 +02:00
vgilc
f0819db5c7 Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales-2' into 'develop'
Change default pie custom graph width size in visual console custom graph creator - #99

See merge request !400
2017-04-24 16:22:34 +02:00
enriquecd
c7af5c3b07 Change default pie custom graph width size in visual console custom graph creator - #99 2017-04-24 16:09:09 +02:00
artica
e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7b68dab8746940fe85f5507fe3ccc6b.
2017-04-24 15:59:34 +02:00
artica
8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
vgilc
19fb8eaf27 Merge branch '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open-2' into 'develop'
Change strings in minor release update manager / open / 2 - #486

See merge request !399
2017-04-24 13:50:35 +02:00
enriquecd
7f927bfdd3 Change strings in minor release update manager / open / 2 - #486 2017-04-24 13:14:14 +02:00
vgilc
ba17d7793a Merge branch '139-no-se-ven-alias-de-agentes-con-acl-estricto-ext-3943' into 'develop'
fixed errors in agent detail acl strict

See merge request !397
2017-04-24 10:56:39 +02:00
daniel
8e481dc473 fixed errors in agent detail acl strict 2017-04-24 10:41:23 +02:00
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
artica
f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +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
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
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
artica
dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +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
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
artica
e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
fermin831
bf368a155b Drop addcol procedure if not exists 2017-04-17 13:25:36 +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
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