Igor Kulikov
96d3b245b0
Revert to version 3.0.0-SNAPSHOT
2020-02-20 12:35:01 +02:00
Igor Kulikov
e9b2c3107e
Merge with master
2020-02-20 12:33:36 +02:00
Igor Kulikov
3e2a87135f
Prepare for merge with master
2020-02-20 10:26:43 +02:00
Chantsova Ekaterina
9f0871af7f
Update field alignment on init, not only on resize; prevent dispaying in a row, when fields should be displayed in a column ( #2434 )
2020-02-20 10:17:35 +02:00
Igor Kulikov
4bbc48317c
Merge branch 'master' of github.com:thingsboard/thingsboard
2020-02-20 10:16:07 +02:00
Igor Kulikov
c17b8cd96c
Fix: Add missing groupId to json forms builder function.
2020-02-20 10:15:57 +02:00
Andrii Shvaika
2a58c6f209
fixed RestClient.saveRelation method
2020-02-20 10:13:37 +02:00
Andrii Shvaika
4cd45e4b3e
Fix for RestClient.getActivateToken method
2020-02-20 08:13:48 +02:00
Igor Kulikov
2a5fffe5f4
Fix upgrade
2020-02-19 19:40:42 +02:00
Igor Kulikov
755f777b16
Fix upgrade
2020-02-19 19:07:32 +02:00
Andrii Shvaika
de6affd805
Merge branch 'master' of github.com:thingsboard/thingsboard
2020-02-19 17:20:45 +02:00
Andrii Shvaika
89a91020ff
Merge branch 'YevhenBondarenko-feature/rest-client'
2020-02-19 17:20:20 +02:00
Igor Kulikov
2bdc1ac3f5
Merge branch 'vvlladd28-bugs/translate_lv_LV'
2020-02-19 17:20:07 +02:00
Andrii Shvaika
317ead6a38
Merge branch 'feature/rest-client' of https://github.com/YevhenBondarenko/thingsboard into YevhenBondarenko-feature/rest-client
2020-02-19 17:20:03 +02:00
Igor Kulikov
ea25db121b
Merge branch 'bugs/translate_lv_LV' of https://github.com/vvlladd28/thingsboard into vvlladd28-bugs/translate_lv_LV
2020-02-19 17:19:53 +02:00
Vladyslav
5113f90a17
Fix name gateway widget ( #2421 )
2020-02-19 17:16:09 +02:00
Chantsova Ekaterina
37173bba10
Features/flot thresholds ( #2412 )
...
* Thresholds draft
* Make generated thresholds unique
* Code refactoring
2020-02-19 17:12:22 +02:00
Igor Kulikov
01108b89a1
Merge branch 'master' of github.com:thingsboard/thingsboard
2020-02-19 17:08:57 +02:00
Igor Kulikov
9d212bf39e
fixed: infinite loop caused by default md-dialog resize function in Safari
2020-02-19 17:08:43 +02:00
Vladyslav_Prykhodko
284638e093
Fix translate language Latvian
2020-02-19 16:48:25 +02:00
Dmitriy Mushat
d5c3a9cc5d
fixed: focus on fullscreen for react schema grouped forms ( #2400 )
2020-02-19 16:14:18 +02:00
Chantsova Ekaterina
1540f08695
Add ability to use custom translations and labels containing apostrophe in table default sort order ( #2397 )
2020-02-19 16:10:54 +02:00
Igor Kulikov
7adeaf21c6
Merge branch 'fumil-master'
2020-02-19 16:06:40 +02:00
Igor Kulikov
8ed03b22bd
Fix conflicts. Store locale translations only in default en_US
2020-02-19 16:06:19 +02:00
Vladyslav
2ea3b0bdaf
Add service methods to claim a device ( #2391 )
2020-02-19 15:50:19 +02:00
Igor Kulikov
f8a3181802
Merge branch 'yefimov-andrey-increase-dashboard-conf'
2020-02-19 15:47:54 +02:00
Igor Kulikov
1e5ee5beb9
Fix conflicts
2020-02-19 15:47:45 +02:00
Igor Kulikov
468f8ba8c0
Merge branch 'Dmitriymush-digital-gauge-value-fix'
2020-02-19 15:39:24 +02:00
YevhenBondarenko
64e0c42ab7
Rest Client improvements
2020-02-19 15:39:22 +02:00
Igor Kulikov
0d6cde3ff8
Fix conflicts
2020-02-19 15:35:32 +02:00
DudnikMaksym
308fa1fd8c
UI: ( #2372 )
...
Added fetchLastLevelOnly checkbox to alias query filter.
Updated ENG, RUS, UKR locales.
Updated getRelatedEntities and (constructRelatedEntitiesSearchQuery) function(s) by adding fetchLastLevelOnly attribute.
2020-02-19 15:24:02 +02:00
Igor Kulikov
7c9f8d755f
Dmitriymush table columns assignment gateway ( #2429 )
...
* added: import of gateway value
* expressions changed
* fixed refactor rename
* changed key and value for translating
* feature/: description added to the list of columns assingment and could be imported/exported from now
* Delete package-lock.json
* Revert package-lock
Co-authored-by: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
2020-02-19 15:19:48 +02:00
Dmitriy Mushat
ec2c435db2
fixed: advanced setting add-on of default marker color cleared up ( #2358 )
2020-02-19 15:04:15 +02:00
Dmitriy Mushat
e4d701598b
Scroll timseries table ( #2360 )
...
* fixed: md-table-container overflox-x changed to visible
* fixed: md-table-container overflox-x changed to visible
* fixed: md-table-container overflox-x changed to visible
* fixed: md-tabs min-height is set to 0
* fixed: md-tabs min-height is set to 0
* fixed: 1) md-table-container overflox-x changed to visible; 2) md-tabs min-height is set to 0
* changed specificity for overriding
2020-02-19 15:03:45 +02:00
blackstar-baba
0fa963be85
fix bug:Device reconnect abnormal when certificate authentication is turned on
2020-02-19 14:56:44 +02:00
zbcumt
07eaf4dd77
Update tencent-map.js ( #2329 )
...
Solve the problem that the polygonOpacity attribute does not work in Tencent map.
2020-02-19 14:49:02 +02:00
Mirco Pizzichini
9d6b1c5d7a
Add option to set bar alignment in 'flot-bar-widget' ( #2320 )
2020-02-19 14:47:56 +02:00
Igor Kulikov
5ca3c497c2
Update package.lock
2020-02-19 14:31:15 +02:00
Yevhen Bondarenko
e7dfe75e41
Feature/rest client ( #2428 )
...
* refactored and improvement Rest Client
* refactored Rest Client, made old methods deprecated
2020-02-19 14:11:20 +02:00
Igor Kulikov
f01049bfb1
Update ngrx config
2020-02-19 13:48:53 +02:00
Igor Kulikov
fd1a069214
Update versions
2020-02-19 13:39:50 +02:00
YevhenBondarenko
a670b77251
refactored and improvement Rest Client
2020-02-19 11:55:58 +02:00
Igor Kulikov
51da3b3dea
Update
2020-02-18 19:01:21 +02:00
Igor Kulikov
f2448f55e7
Minor refactoring
2020-02-18 18:32:15 +02:00
Igor Kulikov
f56161efc5
Minor refactoring
2020-02-18 18:26:14 +02:00
Igor Kulikov
3aa5048861
Minor fixes
2020-02-18 18:12:28 +02:00
Igor Kulikov
dfb26cc033
Date range navigator widget. Minor improvements.
2020-02-18 17:25:17 +02:00
Andrii Shvaika
4c3d6a3c87
Fixed Cassandra installation script
2020-02-18 10:07:46 +02:00
Andrii Shvaika
a32e8b7342
Dockerfile fix
2020-02-17 20:05:58 +02:00
Andrii Shvaika
edb21ae0eb
Dockerfile fix
2020-02-17 19:47:07 +02:00