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

1006 Commits

Author SHA1 Message Date
YevhenBondarenko
9531e891c8 added validation with maxDevices and maxAssets to deviceService and assetService 2020-11-11 11:03:22 +02:00
Volodymyr Babak
3cc0c5baf0 Set version to 3.3.0-SNAPSHOT 2020-11-10 16:43:28 +02:00
Andrii Shvaika
123ea76c94 Improvements for data points storage 2020-11-03 18:59:12 +02:00
Andrii Shvaika
35dbe509f0 Data Points storage 2020-11-03 13:43:27 +02:00
Andrii Shvaika
78ac876103 Bug fixes for Device Profile node 2020-10-29 13:26:15 +02:00
Artem Babak
74b150b384 Added getCustomerEdgeInfos() implementation 2020-10-21 05:40:25 +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
19b8464937 Merge device provisioning feature 2020-10-12 19:39:47 +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
zbeacon
1a718593ec Refactoring 2020-10-12 16:19:36 +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
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
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
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
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +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
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
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