7532 Commits

Author SHA1 Message Date
artica
d090692412 Auto-updated build strings. 2017-06-14 00:01:12 +02:00
enriquecd
2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +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
Daniel Maya
4693702741 Fixed sql error in tagente_datos_log4x 2017-06-12 13:43:53 +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
Daniel Maya
5e099a0da3 added graph colors in dahsboard 2017-06-07 11:43:11 +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
Arturo Gonzalez
f0492c370c Changed format 2017-06-06 15:48:58 +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
vgilc
aedb440ea2 Merge branch '757-full-scale-graph-dev' into 'develop'
757 full scale graph dev

See merge request !552
2017-06-06 09:51:04 +02:00
vgilc
164f70cb7d Merge branch '959-Masivas-de-plugins-no-funcionan' into 'develop'
Decode html entities in module plugin selector for edit bulk operation - #959

See merge request !553
2017-06-06 09:50:14 +02:00
artica
a90906f2c9 Auto-updated build strings. 2017-06-06 00:01:16 +02:00
enriquecd
ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
artu30
c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev'
# Conflicts:
#   pandora_console/include/functions_graph.php
2017-06-05 09:38:06 +02:00
artica
291ae3a192 Auto-updated build strings. 2017-06-05 00:01:13 +02:00
artica
f9da9b404b Auto-updated build strings. 2017-06-04 00:01:14 +02:00
artica
9f041fb76b Auto-updated build strings. 2017-06-03 00:01:19 +02:00
vgilc
a4ecc9374d Merge branch '949-node-events-with-event-replication-dev' into 'develop'
Fixed readonly validation in nodes

See merge request !542
2017-06-02 11:04:22 +02:00
vgilc
eab92ce1c8 Merge branch '925-UM-Offline-y-current_package_enterprise-dev' into 'develop'
Changed current_package_enterprise

See merge request !516
2017-06-02 11:00:51 +02:00
vgilc
1c4f64ac2a Merge branch '936-weird-general-item-in-reports-dev' into 'develop'
Fixed general item in reports

See merge request !526
2017-06-02 10:59:02 +02:00
vgilc
db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop'
Changed custom graph size specs in visual console

See merge request !517
2017-06-02 10:32:58 +02:00
vgilc
12008fee56 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'"
This reverts merge request !547
2017-06-02 10:31:48 +02:00
vgilc
6ad0dde2b7 Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'
fixed errors in errors login

See merge request !547
2017-06-02 09:19:35 +02:00
artica
475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00