2343 Commits

Author SHA1 Message Date
Igor Kulikov
8c29339f13 Add support for port in oauth2 domain name. Update proxy.conf to support oauth2 urls 2020-10-13 13:20:54 +03:00
Andrii Shvaika
6f80cf95e2 Tenant Profile Cache 2020-10-13 11:53:22 +03:00
Igor Kulikov
da7d88470e
Merge pull request #3575 from vvlladd28/improvement/oauth2
Improvement OAuth2
2020-10-13 10:47:20 +03:00
Igor Kulikov
4596e4163d
Merge pull request #3574 from ChantsovaEkaterina/bug/chart-tooltips-wrong-number-of-decimals-after-floating-point
Bug/chart tooltips wrong number of decimals after floating point
2020-10-13 10:39:24 +03:00
Igor Kulikov
19b8464937 Merge device provisioning feature 2020-10-12 19:39:47 +03:00
Vladyslav_Prykhodko
220c5f6275 UI: Change OAuth2 templated json icon 2020-10-12 19:35:11 +03:00
Vladyslav_Prykhodko
1c2ec66f16 Merge remote-tracking branch 'upstream/master' into improvement/oauth2 2020-10-12 18:11:44 +03:00
Igor Kulikov
40be6e588c Fix device wizard dialog. Fix install script for oauth2 client registration templates. 2020-10-12 18:05:26 +03:00
Volodymyr Babak
e64bbad4c3 Set TRACE to DEBUG 2020-10-12 17:37:59 +03:00
vzikratyi
4952c310a4 Added mapperConfig to OAuth2Template 2020-10-12 17:34:49 +03:00
Volodymyr Babak
e98b298267 Re-enabled test 2020-10-12 17:31:24 +03:00
Volodymyr Babak
9ba62199a8 Disabled temporary edge sql test 2020-10-12 17:31:04 +03:00
Volodymyr Babak
0974191172 Test fixed 2020-10-12 16:54:05 +03:00
ShvaykaD
3cd88e6d15 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/device-profile-telemetry-proto-schema 2020-10-12 16:47:07 +03:00
ShvaykaD
8d4718320b init commit 2020-10-12 16:21:05 +03:00
zbeacon
1a718593ec Refactoring 2020-10-12 16:19:36 +03:00
Chantsova Ekaterina
6d4245d603 Chart tooltips: fix wrong number of decimals after floating point 2020-10-12 15:34:02 +03:00
Volodymyr Babak
95786f858c Merge remote-tracking branch 'origin/feature/edge' into feature/3.0-edge 2020-10-12 15:19:06 +03:00
Andrii Shvaika
6d185f1c01 Improvements to device profile rule node 2020-10-12 14:29:20 +03:00
zbeacon
005ad70657 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-12 13:57:01 +03:00
zbeacon
ca4e9238c8 Fix for device provision tests 2020-10-12 13:30:23 +03:00
Volodymyr Babak
dd780d05df Merge remote-tracking branch 'origin/master' into feature/3.0-edge 2020-10-12 12:00:54 +03:00
Igor Kulikov
2b53b2f8db Merge branch 'feature/dynamic-oauth2-new-table' of https://github.com/vzikratyi-tb/thingsboard into vzikratyi-tb-feature/dynamic-oauth2-new-table 2020-10-12 10:42:21 +03:00
Igor Kulikov
cb9f5cde85
Merge pull request #3561 from ChantsovaEkaterina/improvement/extend-multiple-input-settings
Multiple input widget: extend settings
2020-10-12 09:13:50 +03:00
zbeacon
6e4c404929 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-12 08:25:34 +03:00
ShvaykaD
d5bf25e2f3 revert the enqueue(root rule chain) method changes 2020-10-09 18:44:37 +03:00
ShvaykaD
a045be771b added null check for queueName 2020-10-09 18:44:37 +03:00
ShvaykaD
0240476b4e fix duplicates 2020-10-09 18:44:37 +03:00
YevhenBondarenko
8e89ea9729 refactored 2020-10-09 18:44:37 +03:00
YevhenBondarenko
a046459d62 added deviceCreationTime to the DeviceStateData 2020-10-09 18:44:37 +03:00
YevhenBondarenko
fc92a8d536 fixed sending inactivity event after device creation. 2020-10-09 18:44:37 +03:00
ShvaykaD
b63be05ffa revert the enqueue(root rule chain) method changes 2020-10-09 18:44:03 +03:00
ShvaykaD
560b950a8f added null check for queueName 2020-10-09 18:44:03 +03:00
ShvaykaD
b3f6938cf0 fix duplicates 2020-10-09 18:44:03 +03:00
YevhenBondarenko
bec23b4190 refactored 2020-10-09 18:42:03 +03:00
YevhenBondarenko
62748eef60 added deviceCreationTime to the DeviceStateData 2020-10-09 18:42:03 +03:00
YevhenBondarenko
1423074485 fixed sending inactivity event after device creation. 2020-10-09 18:42:03 +03:00
YevhenBondarenko
d838f2a867 fix NPE in DefaultTbDeviceProfileCache 2020-10-09 18:41:14 +03:00
zbeacon
35f6f40ca3 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 17:35:30 +03:00
zbeacon
93278f7236 Refactoring according to comments 2020-10-09 17:32:32 +03:00
Volodymyr Babak
160fd94666 Moved service to base class. Change sync button icon 2020-10-09 15:47:59 +03:00
vzikratyi
2db74b25a4 Removed 'name' from Github OAuth2 template 2020-10-09 10:37:28 +03:00
zbeacon
6683158c6b Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 09:53:08 +03:00
zbeacon
d032b0a3f7 Adding tests 2020-10-09 09:28:04 +03:00
Chantsova Ekaterina
db0b0dcb30 Merge remote-tracking branch 'upstream/master' into improvement/extend-multiple-input-settings 2020-10-08 20:05:29 +03:00
vzikratyi
ac055397b0 Added GITHUB mapper type 2020-10-08 18:22:16 +03:00
zbeacon
6b72e82104 Improvement 2020-10-08 17:30:35 +03:00
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +03:00
zbeacon
17ca3cfab4 Refactoring 2020-10-08 16:51:28 +03:00
Chantsova Ekaterina
aa87ab024e Change widget json config 2020-10-08 16:21:04 +03:00