446 Commits

Author SHA1 Message Date
YevhenBondarenko
f50dec4f76 fix ConstraintViolationException on findOrCreateDeviceProfile 2020-12-22 19:58:54 +02:00
ShvaykaD
637ad6cac5 remove boundStatementBuilder from doSavePartition method 2020-12-22 17:34:23 +02:00
ShvaykaD
24a31d6134 update code 2020-12-21 21:43:09 +02:00
ShvaykaD
e516cd31dc added Caffeine cache for Cassandra ts partitions saving 2020-12-21 19:09:34 +02:00
ShvaykaD
aede1af6f9 improvements after review 2020-12-21 17:06:10 +02:00
ShvaykaD
0de5868bc5 added Caffeine cache for Cassandra ts partitions saving 2020-12-21 17:06:10 +02:00
Volodymyr Babak
f8981638b1 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-18 14:43:04 +02:00
Volodymyr Babak
6d716d1ca4 Fixed edges enabled test property 2020-12-18 14:42:34 +02:00
Volodymyr Babak
9f79f83d83 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-07 11:36:20 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Andrii Shvaika
0fb1147ab2 Alarm Query Tests improved 2020-11-19 12:04:32 +02:00
Andrii Shvaika
ac866faab0 Improvements to the ApiUsageState 2020-11-10 16:19:44 +02:00
Volodymyr Babak
905273ea3d Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-10 16:10:48 +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
461da688f4 Merge with 2.5.5 2020-10-28 15:24:22 +02:00
YevhenBondarenko
8bd617e3b5 created tests for rule chain metadata validator 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
Volodymyr Babak
d825a2a6be Code review changes 2020-10-20 12:12:54 +03:00
Volodymyr Babak
055a91fca1 EdgeEventActionType introduced 2020-10-20 11:36:28 +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
Volodymyr Babak
7af1c86e17 Merge branch 'develop/2.5.5' into feature/edge 2020-10-18 15:33:45 +03:00
Igor Kulikov
7565afca3a Several OAuth2 improvements 2020-10-14 16:43:07 +03:00
vzikratyi
4952c310a4 Added mapperConfig to OAuth2Template 2020-10-12 17:34:49 +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
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
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
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
vzikratyi
91f05282ea Validate domains for SchemeTypes combinations 2020-10-07 13:06:22 +03:00
Andrii Shvaika
c0934b959b Fix for Cassandra Unit 2020-10-06 12:40:29 +03:00
Andrii Shvaika
080a5f1587 Rule Node States 2020-10-02 17:55:40 +03:00
vzikratyi
cd7a7ce425 Renamed domainDtos to domainParams 2020-10-02 10:21:30 +03:00
vzikratyi
c7e236499e Added support for multiple domains in OAuth2 config 2020-10-01 17:22:17 +03:00
Andrii Shvaika
c8f8901a7f Merge with master 2020-09-30 13:11:58 +03:00
Andrii Shvaika
aac5ae9f00 Merge with 2.5 2020-09-30 12:52:30 +03:00
YevhenBondarenko
6824e1c376 changed path for hsqldb file 2020-09-30 11:43:22 +03:00
Vladyslav_Prykhodko
e740e4368a Added parameter filter for transport type in deviceProfile API 2020-09-29 10:18:32 +03:00
Volodymyr Babak
b67e21604b Added edge license key and cloud endpoint 2020-09-25 15:22:03 +03:00
vzikratyi
e841f10b49 Added 'enabled' field to ClientRegistration 2020-09-23 13:15:56 +03:00
vzikratyi
12e2d2efb7 Packed domain objects to ClientParams 2020-09-23 12:49:30 +03:00
vzikratyi
e778b3155a Remove OAuth2Config functionality from Tenant 2020-09-21 17:33:27 +03:00
vzikratyi
86aacc07ae Set default value to 'false' for 'isOAuth2ConfigAllowed' 2020-09-21 13:40:24 +03:00
vzikratyi
5275a3302a Added 'additionalInfo' to ClientRegistration 2020-09-18 11:19:41 +03:00