376 Commits

Author SHA1 Message Date
ShvaykaD
18a57d638d merge with master 2020-11-11 18:25:29 +02:00
ShvaykaD
78c06be350 change protobuf-dynamic dependency 2020-11-11 16:00:04 +02:00
Andrii Shvaika
ac866faab0 Improvements to the ApiUsageState 2020-11-10 16:19:44 +02:00
Andrii Shvaika
5f50fd44d2 Usage Records implementation 2020-11-09 14:06:20 +02:00
Andrii Shvaika
3518a3d927 Merge with master 2020-11-09 10:42:47 +02:00
ShvaykaD
73489beaf6 fix exceptions message regex, tests, ui code clean up 2020-11-05 15:43:04 +02:00
Andrii Shvaika
123ea76c94 Improvements for data points storage 2020-11-03 18:59:12 +02:00
Andrii Shvaika
3ee3839c3c Protection from infinite loops 2020-10-29 15:53:11 +02:00
ShvaykaD
37c381996e ui updates 2020-10-29 14:58:28 +02:00
ShvaykaD
e334def935 fix telemetry & attributes tests 2020-10-29 13:34:27 +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
03581c2941 Usage records 2020-10-27 18:30:23 +02:00
ShvaykaD
f0f30dc9c7 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/device-profile-telemetry-proto-schema 2020-10-23 16:12:41 +03:00
ShvaykaD
4eafa92cb7 added parser tests 2020-10-23 15:40:37 +03: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
7565afca3a Several OAuth2 improvements 2020-10-14 16:43:07 +03:00
ShvaykaD
8bdf990ed2 revert changes 2020-10-13 16:23:23 +03:00
ShvaykaD
f89fd60e7c fix typo 2020-10-13 16:21:57 +03:00
ShvaykaD
d11a1ba7e6 cleanup code 2020-10-13 16:06:18 +03:00
ShvaykaD
e85daa81e0 merge with master 2020-10-13 14:00:15 +03:00
ShvaykaD
64cc74c26c cleanup code 2020-10-13 13:57:38 +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
vzikratyi
4952c310a4 Added mapperConfig to OAuth2Template 2020-10-12 17:34:49 +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
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
Igor Kulikov
8cfbcee05e Minor fixes 2020-10-12 10:58:28 +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
vzikratyi
e2791a289b Removed EntityId for OAuth2Config 2020-10-08 16:04:03 +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
zbeacon
adf5069da1 Added ability to provision credentials type from device using provision feature 2020-10-08 15:08:29 +03:00
vzikratyi
c42c23c380 Refactored and fixed code 2020-10-08 12:22:26 +03:00
vzikratyi
b02fbe860c Merge branch 'develop/3.2' into feature/dynamic-oauth2-new-table
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
#	dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
#	dao/src/test/resources/sql/hsql/drop-all-tables.sql
#	dao/src/test/resources/sql/psql/drop-all-tables.sql
#	dao/src/test/resources/sql/timescale/drop-all-tables.sql
#	ui-ngx/src/app/modules/home/pages/tenant/tenant.component.ts
2020-10-08 11:22:13 +03:00
Igor Kulikov
059b456f70 Move device/tenant profile entitiy type enums to the end of list. 2020-10-08 09:20:35 +03:00
Andrii Shvaika
5dd460b81d Some improvements 2020-10-07 14:13:25 +03:00