Daniel Maya
|
c678d8ba50
|
Merge branch 'develop' into '330-Agentes-sin-alertas-dev'
# Conflicts:
# pandora_console/include/functions_ui.php
|
2017-06-20 11:06:24 +02:00 |
artica
|
e56d147345
|
Auto-updated build strings.
|
2017-06-20 00:01:16 +02:00 |
slerena
|
c1166f280a
|
Merge branch '1025-bug-with-more-than-6-months-charts-dev' into 'develop'
Fixed more than 6 months charts
See merge request !591
|
2017-06-19 17:50:48 +02:00 |
vgilc
|
6c087b0f6b
|
Merge branch '989-um-online-open-js-error-dev' into 'develop'
Added correct button declaration
See merge request !561
|
2017-06-19 09:10:47 +02:00 |
|
vgilc
|
4b031d3337
|
Merge branch '992-Modulo-data-server-se-queda-en-desconocido-dev' into 'develop'
Fixed current_interval in data server
See merge request !572
|
2017-06-19 09:10:14 +02:00 |
|
vgilc
|
2e72025bbf
|
Merge branch '874-Añadir-posibilidad-de-ver-todos-los-eventos' into 'develop'
add checkbox for show all events in view agent detail
See merge request !585
|
2017-06-19 09:09:24 +02:00 |
|
artica
|
5e4b1d6965
|
Auto-updated build strings.
|
2017-06-19 00:01:14 +02:00 |
|
artica
|
89ea98f505
|
Auto-updated build strings.
|
2017-06-18 00:01:14 +02:00 |
|
artica
|
8e94fd58f4
|
Auto-updated build strings.
|
2017-06-17 00:01:16 +02:00 |
Arturo Gonzalez
|
687e970c8e
|
Fixed more than 6 months charts
|
2017-06-16 14:42:16 +02:00 |
|
artica
|
0059f79012
|
Auto-updated build strings.
|
2017-06-16 00:01:14 +02:00 |
|
artica
|
70c651466e
|
Auto-updated build strings.
|
2017-06-15 00:01:27 +02:00 |
daniel
|
80a38cbd9f
|
add checkbox for show all events in view agent detail
|
2017-06-14 12:45:40 +02:00 |
|
Daniel Maya
|
f07f0d1a00
|
fixed conflict
|
2017-06-14 12:06:41 +02:00 |
|
vgilc
|
d8fc3ac9e9
|
Merge branch 'No-funciona-módulo-system-dev' into 'develop'
Fixed problem in data display snmp wizard
See merge request !534
|
2017-06-14 11:50:26 +02:00 |
|
vgilc
|
c78711ba6f
|
Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop'
539 encrypt agent custom fields in pandora console dev
See merge request !520
|
2017-06-14 11:42:51 +02:00 |
|
vgilc
|
7bfd3254a7
|
Merge branch '656-changes-in-system-log-viewer-dev' into 'develop'
Added changes
See merge request !518
|
2017-06-14 11:32:44 +02:00 |
|
vgilc
|
9b35a7f5ba
|
Merge branch '975-dot-and-plain-files-path-in-windows-dev' into 'develop'
Added OS filter
See merge request !557
|
2017-06-14 10:48:44 +02:00 |
|
vgilc
|
91f8e9d65c
|
Merge branch '1010-Actualizar-servername-cuando-haya-cambio-de-mayúculas' into 'develop'
fixed errors caase sensitive servername
See merge request !583
|
2017-06-14 10:41:46 +02:00 |
|
artica
|
d090692412
|
Auto-updated build strings.
|
2017-06-14 00:01:12 +02:00 |
|
daniel
|
d85ec51220
|
fixed errors caase sensitive servername
|
2017-06-13 12:42:21 +02:00 |
|
Arturo Gonzalez
|
c506c9cce6
|
Added a condition to small charts
|
2017-06-13 09:45:08 +02:00 |
|
Arturo Gonzalez
|
e237198d06
|
Added a final fix
|
2017-06-13 09:26:08 +02:00 |
|
artica
|
8ba1cf66af
|
Auto-updated build strings.
|
2017-06-13 00:02:03 +02:00 |
|
vgilc
|
03e17e335f
|
Merge branch '637-moduledata-macro-dev' into 'develop'
Added moduledata macro help text
See merge request !580
|
2017-06-12 18:04:54 +02:00 |
|
Arturo Gonzalez
|
0af82fd69d
|
Added some code to manage timestamps in chart data
|
2017-06-12 17:48:42 +02:00 |
|
Arturo Gonzalez
|
6f343ccd74
|
Added moduledata macro help text
|
2017-06-12 17:10:19 +02:00 |
|
vgilc
|
dbd510f6a0
|
Merge branch '757-fullscale-charts-all-data-dev' into 'develop'
Added some code to put all data in the chart
See merge request !579
|
2017-06-12 16:56:32 +02:00 |
|
Arturo Gonzalez
|
e3443e044f
|
Added some code to put all data in the chart
|
2017-06-12 16:39:46 +02:00 |
artica
|
d3df682528
|
Updated version and build strings.
|
2017-06-12 16:05:06 +02:00 |
enriquecd
|
131753cfba
|
Inprove event title format and alias rather name - #523
|
2017-06-12 14:34:03 +02:00 |
|
Arturo Gonzalez
|
00ac431216
|
Added code to manage timestamps in fullscale mode
|
2017-06-12 13:33:41 +02:00 |
|
artica
|
ff30396595
|
Auto-updated build strings.
|
2017-06-12 00:01:16 +02:00 |
|
artica
|
0d458763b9
|
Auto-updated build strings.
|
2017-06-11 00:01:13 +02:00 |
|
artica
|
97bf8f1fda
|
Auto-updated build strings.
|
2017-06-10 00:01:13 +02:00 |
|
artica
|
1f94295c0c
|
Auto-updated build strings.
|
2017-06-09 00:01:17 +02:00 |
|
Daniel Maya
|
aec9251b88
|
Fixed current_interval in data server
|
2017-06-08 17:04:43 +02:00 |
|
daniel
|
2d441437a8
|
fixed errors in login page
|
2017-06-08 11:26:16 +02:00 |
|
Arturo Gonzalez
|
4e02e31c8b
|
Trace removed
|
2017-06-08 09:01:36 +02:00 |
|
artica
|
bb17348087
|
Auto-updated build strings.
|
2017-06-08 00:01:15 +02:00 |
|
Arturo Gonzalez
|
7782b08b59
|
Added lost value
|
2017-06-07 15:10:51 +02:00 |
|
artu30
|
01f6f6ef5b
|
Merge branch 'develop' into '851-new-report-type-max+min+avg-dev'
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.item_editor.php
# pandora_console/include/functions_reporting_html.php
|
2017-06-07 14:56:44 +02:00 |
|
Arturo Gonzalez
|
474957249b
|
Added correct button declaration
|
2017-06-07 10:29:01 +02:00 |
|
vgilc
|
149a77a559
|
Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop'"
This reverts merge request !558
|
2017-06-07 09:32:35 +02:00 |
|
vgilc
|
c674892709
|
Revert "Merge branch 'fixed-errors-in-login' into 'develop'"
This reverts merge request !559
|
2017-06-07 09:31:46 +02:00 |
|
artica
|
a19b321f9a
|
Auto-updated build strings.
|
2017-06-07 00:01:14 +02:00 |
|
Arturo Gonzalez
|
5d9d1cf77b
|
Added better idea, thanks luis
|
2017-06-06 15:53:56 +02:00 |
|
daniel
|
c25c5acfeb
|
fixed errors instalation
|
2017-06-06 15:22:58 +02:00 |
|
daniel
|
5d3a0c4ab7
|
fixed errors in login page
|
2017-06-06 13:57:10 +02:00 |
|
Arturo Gonzalez
|
8b75167cf8
|
Added OS filter
|
2017-06-06 13:11:28 +02:00 |