995 Commits

Author SHA1 Message Date
YevhenBondarenko
5de0059eb7 apiUsageState improvements 2020-11-11 16:25:25 +02:00
Igor Kulikov
a5e8cab5e0
Merge pull request #3700 from YevhenBondarenko/feature/api-usage-state-tmp
api usage state alias improvements
2020-11-11 14:03:40 +02:00
YevhenBondarenko
b76ec50123 refactored 2020-11-11 13:03:22 +02:00
YevhenBondarenko
ebf10b55c8 api usage state alias improvements 2020-11-11 12:59:22 +02:00
Andrew Shvayka
ca0b0b20a7
Merge branch 'master' into develop/2.5.5 2020-11-11 11:54:33 +02:00
zbeacon
92ba5907b0 Added validation for deviceName/attribute key contains only spaces situation 2020-11-11 11:05:07 +02:00
YevhenBondarenko
9531e891c8 added validation with maxDevices and maxAssets to deviceService and assetService 2020-11-11 11:03:22 +02:00
Andrii Shvaika
ac866faab0 Improvements to the ApiUsageState 2020-11-10 16:19:44 +02:00
Andrii Shvaika
3518a3d927 Merge with master 2020-11-09 10:42:47 +02:00
Andrii Shvaika
123ea76c94 Improvements for data points storage 2020-11-03 18:59:12 +02:00
Andrii Shvaika
a64c4e3e20 DeviceProfileNode fix for conditions based on the attributes 2020-11-03 13:05:31 +02:00
Andrii Shvaika
78ac876103 Bug fixes for Device Profile node 2020-10-29 13:26:15 +02:00
YevhenBondarenko
7724495cb1 added default queue for device profile 2020-10-28 17:20:53 +02:00
Andrii Shvaika
461da688f4 Merge with 2.5.5 2020-10-28 15:24:22 +02:00
Andrii Shvaika
03581c2941 Usage records 2020-10-27 18:30:23 +02:00
YevhenBondarenko
8bd617e3b5 created tests for rule chain metadata validator 2020-10-27 18:18:46 +02:00
YevhenBondarenko
44a700e89a rule chain circles validation improvements 2020-10-27 18:18:46 +02:00
YevhenBondarenko
174570610b added circles validation in BaseRuleChainService 2020-10-27 18:18:46 +02:00
Andrii Shvaika
b38b47f409 JS Invoke Service stats 2020-10-22 18:51:34 +03:00
Andrii Shvaika
0b83ae8b9a Merge branch 'feature/usage-records' of github.com:thingsboard/thingsboard into feature/usage-records 2020-10-22 15:56:38 +03:00
Andrii Shvaika
0e0ab6ca39 Improvements to API State 2020-10-22 15:56:31 +03:00
YevhenBondarenko
41212e11c0 created tenant profile configuration 2020-10-22 15:50:12 +03:00
YevhenBondarenko
42dd386182 Merge branch 'feature/usage-records' of https://github.com/thingsboard/thingsboard into feature/usage-records 2020-10-20 19:30:41 +03:00
Andrii Shvaika
9d14a38966 Tenant Profile updates for ApiUsageStateService 2020-10-20 18:57:15 +03:00
YevhenBondarenko
7e88376030 created alias ApiUsageState 2020-10-20 18:55:52 +03:00
Andrii Shvaika
9ec4b77672 Improvements to ApiUsageState persistence 2020-10-20 15:50:04 +03:00
Andrii Shvaika
b598a73954 Renaming of UsageRecord to ApiUsageState 2020-10-19 19:51:58 +03:00
Andrii Shvaika
2e694e1d64 Dao layer for UsageRecords 2020-10-19 15:39:15 +03:00
Igor Kulikov
9a7d5a437e Fix OAuth2 domain params order 2020-10-14 18:22:03 +03:00
Igor Kulikov
7565afca3a Several OAuth2 improvements 2020-10-14 16:43:07 +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
19b8464937 Merge device provisioning feature 2020-10-12 19:39:47 +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
vzikratyi
4952c310a4 Added mapperConfig to OAuth2Template 2020-10-12 17:34:49 +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
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
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
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
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
vzikratyi
ac055397b0 Added GITHUB mapper type 2020-10-08 18:22:16 +03:00
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +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
vzikratyi
c42c23c380 Refactored and fixed code 2020-10-08 12:22:26 +03:00
vzikratyi
6ae75e295c Removed LockService 2020-10-08 12:21:53 +03:00
vzikratyi
d2f45db0a6 Removed unused changes to AttributeDao 2020-10-08 11:47:11 +03:00