5203 Commits

Author SHA1 Message Date
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
054fcba46f UI: Change OAuth2 templated icon 2020-10-12 19:33:52 +03:00
Chantsova Ekaterina
df784db8a1 Refactoring 2020-10-12 19:31:42 +03:00
Vladyslav_Prykhodko
1c2ec66f16 Merge remote-tracking branch 'upstream/master' into improvement/oauth2 2020-10-12 18:11:44 +03:00
Vladyslav_Prykhodko
1f7623352a UI: refactoring OAuth2/Login Page and added oauth mapperType GITHUB 2020-10-12 18:11:22 +03:00
Igor Kulikov
d0fafb95d4 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-12 18:05:36 +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
Andrii Shvaika
3ae7957a0e Improved scheduler logic 2020-10-12 18:03:20 +03:00
vzikratyi
4952c310a4 Added mapperConfig to OAuth2Template 2020-10-12 17:34:49 +03:00
Igor Kulikov
f1cc4fbd04 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-12 17:29:42 +03:00
Igor Kulikov
155b967b47 Improve device profile alarm rules UI 2020-10-12 17:29:27 +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
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
Andrii Shvaika
c4625177d8 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-12 12:12:05 +03:00
Andrii Shvaika
bebddfd1ae Improved logic of alarm rules 2020-10-12 12:11:53 +03:00
Volodymyr Babak
ba96409e5d Code review fixes 2020-10-12 11:26:37 +03:00
Volodymyr Babak
ee6bc5ec4b Fixed issue for last level query in case entities have more relations in the hierarchy below requested level 2020-10-12 11:26:37 +03:00
Igor Kulikov
628ce7991d Merge branch 'vzikratyi-tb-feature/dynamic-oauth2-new-table' 2020-10-12 10:58:48 +03:00
Igor Kulikov
8cfbcee05e Minor fixes 2020-10-12 10:58:28 +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
93fc099ee3 Merge branch 'vvlladd28-improvement/device-profile/refactoring' 2020-10-12 10:18:54 +03:00
Igor Kulikov
7640d32d3b Fix conflicts 2020-10-12 10:18:43 +03:00
Igor Kulikov
20c90c8a6f Improve device/device profile components, remove unnecessary transport configurations 2020-10-12 10:12:42 +03:00
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +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
Igor Kulikov
48c0c9fd8f
Merge pull request #3559 from ChantsovaEkaterina/bug/missed-custom-translations-in-labels
Add missed custom translations for key labels
2020-10-12 09:12:42 +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
Igor Kulikov
765ced2954 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-09 19:23:21 +03:00
Igor Kulikov
d13116db19 Update device transport type hints. Update device profile autocomplete - select first profile option 2020-10-09 19:23:02 +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
Vladyslav_Prykhodko
8c9328f9c5 UI: Improvement created device profile 2020-10-09 18:12:25 +03:00
Vladyslav_Prykhodko
76485dfdad UI: Improvement UI device profile alarm scheduler, added text select time interval 2020-10-09 18:12:06 +03:00