995 Commits

Author SHA1 Message Date
Andrii Shvaika
77d754ad90 Fetch Last Level Only improvement 2020-10-08 11:45:01 +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
Andrii Shvaika
d508bb671b Automatic update of the root rule chain in 3.2 2020-10-08 10:57:48 +03:00
Andrii Shvaika
15743bcf91 Fetch Last Level Only + Distinct values 2020-10-07 15:43:47 +03:00
vzikratyi
91f05282ea Validate domains for SchemeTypes combinations 2020-10-07 13:06:22 +03:00
zbeacon
e8220e5102 Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-07 10:36:15 +03:00
Igor Kulikov
1f5f411b4c Merge with develop/2.5.5 2020-10-06 19:07:30 +03:00
Andrii Shvaika
67f8327cde Minor improvements for event truncation 2020-10-06 18:41:48 +03:00
YevhenBondarenko
872a6fb45d added checkAndTruncateDebugEvent 2020-10-06 18:36:49 +03:00
Illia Barkov
0751824c33
Merge branch 'develop/3.2' into feature/device-provision-3.2-onlyProfileVersion 2020-10-06 12:47:03 +03:00
Andrii Shvaika
c0934b959b Fix for Cassandra Unit 2020-10-06 12:40:29 +03:00
zbeacon
9a022c1a52 Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-05 15:24:18 +03:00
Andrii Shvaika
b5bfb082b7 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-10-05 11:34:37 +03:00
zbeacon
6eac10d60c Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-05 09:19:01 +03:00
zbeacon
8c9dda1b4d Added ability to provision device using protobuf 2020-10-05 08:51:51 +03:00
Andrii Shvaika
080a5f1587 Rule Node States 2020-10-02 17:55:40 +03:00
Valerii Sosliuk
17053118e1 rule chain bulk import export 2020-10-02 13:54:06 +03:00
zbeacon
1bb1f5be8b Refactoring 2020-10-02 10:42:34 +03:00
vzikratyi
cd7a7ce425 Renamed domainDtos to domainParams 2020-10-02 10:21:30 +03:00
vzikratyi
6b41fb9c0e Refactored and used MiscUtils 2020-10-01 18:06:20 +03:00
vzikratyi
c7e236499e Added support for multiple domains in OAuth2 config 2020-10-01 17:22:17 +03:00
zbeacon
2704696f2b Moved provisionDeviceKey as regular column 2020-10-01 12:23:12 +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
zbeacon
950907d398 Refactoring according to comments from @YevhenBondarenko 2020-09-29 11:30:32 +03:00
zbeacon
e86c07599c Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-09-29 11:17:05 +03:00
Vladyslav_Prykhodko
e740e4368a Added parameter filter for transport type in deviceProfile API 2020-09-29 10:18:32 +03:00
zbeacon
b80fc6592b Refactoring 2020-09-28 15:54:13 +03:00
zbeacon
263dd8f9b3 Removed provision info from device dao 2020-09-28 15:48:23 +03:00
YevhenBondarenko
4dc6b45547 DefaultAlarmQueryRepository improvements 2020-09-28 11:44:42 +03:00
zbeacon
8a8695f260 Working version for provision feature with provision credentials on device level 2020-09-23 14:24:44 +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
zbeacon
15be6d60a3 Added strategy checking 2020-09-22 08:36:08 +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
zbeacon
d228208072 Provision init 2020-09-18 16:11:49 +03:00
vzikratyi
5275a3302a Added 'additionalInfo' to ClientRegistration 2020-09-18 11:19:41 +03:00
Igor Kulikov
259af14bb6 Fix DAO tests 2020-09-17 20:14:43 +03:00
vzikratyi
0cab032585 Added loginButton label and icon to OAuth2Template 2020-09-17 11:35:42 +03:00
vzikratyi
bfc3e75fc9 Unpacked Domain objects from ClientParams 2020-09-17 11:14:27 +03:00
vzikratyi
c3407bfddc Group ClientRegistrations by Domain 2020-09-16 16:43:59 +03:00
vzikratyi
14939c27e6 Added 'deleteByDomain' for OAuth2Service 2020-09-16 16:43:57 +03:00
Andrii Shvaika
f67860bb09 Device Profile Rule Node 2020-09-16 16:16:31 +03:00
Andrii Shvaika
e353ab3c81 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-15 16:13:48 +03:00
Andrii Shvaika
4d012ac62d DeviceProfile rule node draft 2020-09-15 16:13:39 +03:00
Igor Kulikov
c2b4d9c8ae Merge with master 2020-09-14 14:25:08 +03:00
vzikratyi
081c83b725 Refactored saving latest ts 2020-09-11 14:19:47 +03:00
vzikratyi
ac0f4bc722 Sort entities before batch update (for SQL) 2020-09-11 14:19:47 +03:00