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 |
|
Vladyslav_Prykhodko
|
30a6a462da
|
UI: Improvement view device profile settings
|
2020-10-09 18:11:49 +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 |
|
Igor Kulikov
|
c7b57ca543
|
Add Device Wizard improvements
|
2020-10-09 17:19:51 +03:00 |
|
Chantsova Ekaterina
|
6de23fe365
|
Refactoring
|
2020-10-09 11:07:10 +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 |
|
Chantsova Ekaterina
|
e2b955299e
|
Add missed custom translations for key labels
|
2020-10-08 19:58:39 +03:00 |
|
vzikratyi
|
ac055397b0
|
Added GITHUB mapper type
|
2020-10-08 18:22:16 +03:00 |
|
Igor Kulikov
|
e10696087e
|
Merge branch 'master' into feature/wizard
|
2020-10-08 17:51:38 +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 |
|
zbeacon
|
6df9219790
|
Improvements for provisioning
|
2020-10-08 16:13:45 +03:00 |
|
vzikratyi
|
e2791a289b
|
Removed EntityId for OAuth2Config
|
2020-10-08 16:04:03 +03:00 |
|
vzikratyi
|
ea9d18e32d
|
Removed upper-case from providerId
|
2020-10-08 15:59:51 +03:00 |
|
vzikratyi
|
985e0350d8
|
Merge branch 'master' into feature/dynamic-oauth2-new-table
# Conflicts:
# common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
|
2020-10-08 15:38:13 +03:00 |
|