ca1d0b3981
Added new translations
2017-04-26 12:19:24 +02:00
6aab4e60ae
Added buttons text to translate them
2017-04-26 09:50:42 +02:00
d10b0906ec
Merge branch '141-cli-pandora-create_data_module' into 'develop'
...
fixed error cli pandora-create_data_module
See merge request !405
2017-04-25 17:17:39 +02:00
1e5cf2d44e
Merge branch '409-change-font-size-of-map-gis' into 'develop'
...
Gis Maps Feature: When scrolling in map, change font-size of labels.
See merge request !360
2017-04-25 16:27:37 +02:00
cdf95a47dd
Merge branch '140-error-a-la-hora-de-duplicar-alertas-snmp' into 'develop'
...
fixed error duplicate alert SNMP
Closes #140
See merge request !402
2017-04-25 16:27:17 +02:00
4040f024fa
Merge branch '114-selector-multiple-muy-pequeno-en-graficas-de-agente' into 'develop'
...
Make combobox of custom graph editor in agent view width adaptable - #114
See merge request !348
2017-04-25 16:26:45 +02:00
4b5da69e31
Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop'
...
Change sec url string in message and vconsole section - #688 - 2
See merge request !378
2017-04-25 16:21:00 +02:00
5e72afaec8
Merge branch '679-añadir-tooltips-a-opciones-de-una-recon' into 'develop'
...
Added tooltips in recon
See merge request !335
2017-04-25 16:19:09 +02:00
d420c98560
Merge branch 'ent-515-Macro-para-SO' into 'develop'
...
Added macro _agentos_
See merge request !275
2017-04-25 16:18:00 +02:00
a8d3ea7454
Merge branch '678-estadísticas-de-eventos-con-gráficas-desiguales' into 'develop'
...
Fixed size graphs in event_statistics
See merge request !340
2017-04-25 16:17:12 +02:00
8802f1cdca
Merge branch '605-ayuda-descolocada-modulos-webserver' into 'develop'
...
Fixed text overflow in help window
See merge request !332
2017-04-25 16:16:29 +02:00
ea6afb3701
Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen' into 'develop'
...
Added floating control in agents/modules, event list and snmp traps list
See merge request !351
2017-04-25 16:15:41 +02:00
48939e10e7
Merge branch '716-delete_all_checkbox_in_report_items' into 'develop'
...
Added checkbox to selet all items in report (to delete them)
See merge request !366
2017-04-25 16:06:34 +02:00
dfd0bb38e8
Merge branch '672-change_forums_url_in_wellcome_window' into 'develop'
...
Changed forums url in wellcome window
See merge request !343
2017-04-25 16:05:34 +02:00
4113369680
Updated version and build strings.
2017-04-25 15:35:09 +02:00
f6290d25fa
fixed error cli pandora-create_data_module
2017-04-25 13:48:17 +02:00
ed2597fab7
Merge branch 'Borrado-1.sql-dev' into 'develop'
...
deleted 1.sql
See merge request !403
2017-04-25 10:42:26 +02:00
bd5cda07c4
deleted 1.sql
2017-04-25 10:28:46 +02:00
13e2f2d05b
fixed error duplicate alert SNMP
2017-04-25 09:30:59 +02:00
d3f998b081
Auto-updated build strings.
2017-04-25 00:01:17 +02:00
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
f2d52e80b6
Chango left margin in pie float - #99
2017-04-24 17:29:13 +02:00
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
c7af5c3b07
Change default pie custom graph width size in visual console custom graph creator - #99
2017-04-24 16:09:09 +02:00
e32d353cc2
Revert "Updated version and build strings."
...
This reverts commit 8c49cfffd7
2017-04-24 15:59:34 +02:00
8c49cfffd7
Updated version and build strings.
2017-04-24 15:39:47 +02:00
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
7f927bfdd3
Change strings in minor release update manager / open / 2 - #486
2017-04-24 13:14:14 +02:00
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
8e481dc473
fixed errors in agent detail acl strict
2017-04-24 10:41:23 +02:00
0aa6835df7
Auto-updated build strings.
2017-04-24 00:01:12 +02:00
37e1daca9f
Auto-updated build strings.
2017-04-23 00:01:13 +02:00
37fcc10551
Auto-updated build strings.
2017-04-22 00:01:56 +02:00
f6faa4861b
Auto-updated build strings.
2017-04-21 00:01:18 +02:00
c3ccb00b2a
new file.
2017-04-20 13:36:03 +02:00
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
4c07fe5d3f
Added nodes regeneration in map group updates
2017-04-20 13:18:55 +02:00
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
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
dd25cff4ec
Auto-updated build strings.
2017-04-20 00:01:19 +02:00
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
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
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
43993e1a14
Auto-updated build strings.
2017-04-19 00:01:21 +02:00
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
3454490220
Fixed a typo error
2017-04-18 16:20:50 +02:00
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
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
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
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
Arturo Gonzalez
vgilc
artica
daniel
Daniel Maya
artica
enriquecd
Alejandro Gallardo Escobar
Enrique Camargo
Ramon Novoa
m-lopez-f