dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,142 Commits 106 Branches 71 Tags
Commit Graph

1029 Commits

Author SHA1 Message Date
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
zbeacon
616f6a8b4f Changed Provision statuses 2020-10-06 17:17:50 +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
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
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
zbeacon
950907d398 Refactoring according to comments from @YevhenBondarenko 2020-09-29 11:30:32 +03:00
Vladyslav_Prykhodko
e740e4368a Added parameter filter for transport type in deviceProfile API 2020-09-29 10:18:32 +03:00
zbeacon
70b8647ef4 Refactoring to use provision data only from device profile 2020-09-28 15:16:38 +03:00
Volodymyr Babak
b67e21604b Added edge license key and cloud endpoint 2020-09-25 15:22:03 +03:00
vzikratyi
12e2d2efb7 Packed domain objects to ClientParams 2020-09-23 12:49:30 +03:00
Volodymyr Babak
458550b853 Set version to 2.6.0 2020-09-23 12:07:16 +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
zbeacon
d228208072 Provision init 2020-09-18 16:11:49 +03:00
Volodymyr Babak
4bb56df51a Added cassandra edge dao. Tests fixed 2020-09-17 12:53:38 +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
Volodymyr Babak
c526d13e45 Merge remote-tracking branch 'upstream/develop/2.5.5' into feature/edge 2020-09-10 19:17:20 +03:00
Igor Kulikov
af77d57768 Merge with master 2020-09-07 15:15:41 +03:00
Igor Kulikov
83ea3f0836 Move from device type to device profile 2020-09-07 14:45:41 +03:00
Andrii Shvaika
73a1a79821 Device Profile updates 2020-09-04 16:51:56 +03:00
Trevor Muraro
57076e64a6 Add full DataStax Java Driver SSL configs 2020-09-04 14:22:28 +03:00
Andrii Shvaika
e67946e47f Upgrade script implementation 2020-09-04 12:53:22 +03:00
Igor Kulikov
7e55fd138d Restore version 3.1.1-SNAPSHOT 2020-09-01 14:55:41 +03:00
Igor Kulikov
f2822b2c3e Temporarily version set to 2.5.5-SNAPSHOT 2020-09-01 14:53:30 +03:00
Igor Kulikov
16f088ecf9 Merge with master 2020-09-01 14:40:28 +03:00
YevhenBondarenko
4df660fe03 added maven-source-plugin 2020-08-31 12:39:41 +03:00
vzikratyi
2cd5b646e3 Fixed merge 2020-08-31 10:43:15 +03:00
vzikratyi
faf0184cff Merge remote-tracking branch 'upstream/master' into feature/dynamic-oauth2-new-table 
# Conflicts:
#	application/src/main/data/upgrade/3.1.0/schema_update.sql
 2020-08-31 10:27:39 +03:00
Andrii Shvaika
8ec23f22d4 Version set 2.5.5-SNAPSHOT 2020-08-28 19:02:31 +03:00
Volodymyr Babak
1de29d7b51 Remove unused code 2020-08-28 15:27:43 +03:00
Bohdan Smetaniuk
1d5f5c5d80 code fixes 2020-08-25 14:04:47 +03:00
Bohdan Smetaniuk
581f23b0b0 fixes + processing attributes delete msg from edge 2020-08-21 18:50:11 +03:00
Igor Kulikov
8e3c399087 Restore version 3.1.1-SNAPSHOT 2020-08-21 14:01:08 +03:00
Igor Kulikov
e40d13ebcb Temp versions set to 2.5.4-SNAPSHOT 2020-08-21 13:59:06 +03:00
Igor Kulikov
266af3c1a2 Introduce DeviceProfileInfo, release 3.2 upgrade script. 2020-08-21 13:34:10 +03:00
Andrii Shvaika
b341030c8f Version set to 2.5.4-SNAPSHOT 2020-08-20 16:52:41 +03:00
Igor Kulikov
3ddf14668e Tenant and Device profiles DAO layer 2020-08-18 18:58:53 +03:00
Igor Kulikov
7d7a50628b Version set to 3.2.0-SNAPSHOT 2020-08-17 18:11:43 +03:00
Igor Kulikov
654e380efd Version set to 3.1.1-SNAPSHOT 2020-08-13 12:42:37 +03:00
vzikratyi
2c537b28f4 Added ClientRegistrationTemplate 2020-08-12 17:31:34 +03:00
vzikratyi
32c8d7e5fd Removed 'registrationId' from ClientRegistration 2020-08-12 13:14:10 +03:00
vzikratyi
61a6fdbc03 Moved OAuth2 config to separate table in DB 2020-08-05 17:35:36 +03:00
YevhenBondarenko
6458db74fa EntityView improvements 2020-08-04 20:15:31 +03:00
Igor Kulikov
974bfd39a5 Update EntityView - copy latest timeseries, delete previous attributes, latest timeseries on entity view update 2020-08-04 14:53:59 +03:00