Andrii Shvaika
|
7a34e2a3f5
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-15 18:16:40 +03:00 |
|
Andrii Shvaika
|
6ea39e835e
|
Transport Rate Limits are now configurable via Tenant Profile
|
2020-10-15 18:16:27 +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
|
1f2719e321
|
fix typos
|
2020-10-13 16:17:39 +03:00 |
|
ShvaykaD
|
d11a1ba7e6
|
cleanup code
|
2020-10-13 16:06:18 +03:00 |
|
Andrii Shvaika
|
7a09f8c718
|
Minor improvemetns
|
2020-10-13 14:46:35 +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 |
|
Igor Kulikov
|
40be6e588c
|
Fix device wizard dialog. Fix install script for oauth2 client registration templates.
|
2020-10-12 18:05:26 +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 |
|
zbeacon
|
1a718593ec
|
Refactoring
|
2020-10-12 16:19:36 +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 |
|
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 |
|
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 |
|
Vladyslav_Prykhodko
|
0f66d738c6
|
Merge upstream/master
|
2020-10-08 17:28:40 +03:00 |
|
zbeacon
|
17ca3cfab4
|
Refactoring
|
2020-10-08 16:51:28 +03:00 |
|
zbeacon
|
6df9219790
|
Improvements for provisioning
|
2020-10-08 16:13:45 +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
|
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 |
|
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 |
|
Andrii Shvaika
|
08e4b38b13
|
Merge branch 'feature/device-provision-3.2-onlyProfileVersion' of https://github.com/zbeacon/thingsboard into zbeacon-feature/device-provision-3.2-onlyProfileVersion
|
2020-10-07 12:13:19 +03:00 |
|
Andrii Shvaika
|
7b3d903cff
|
Merge with develop 2.5.5
|
2020-10-07 12:11:37 +03:00 |
|
Andrii Shvaika
|
de9cd8939e
|
Fix for client certificate check
|
2020-10-07 12:06:24 +03:00 |
|
chienfuchen32
|
a6d69cc7a8
|
add validity on device X.509 certificate over MQTT transport connection
|
2020-10-07 11:50:22 +03:00 |
|
zbeacon
|
16732dfaa9
|
Merge branch 'feature/device-provision-3.2-onlyProfileVersion' of https://github.com/zbeacon/thingsboard into feature/device-provision-3.2-onlyProfileVersion
|
2020-10-06 18:29:03 +03:00 |
|
zbeacon
|
2ec09e08ff
|
Added ProvisionTransportType to get protocol
|
2020-10-06 18:27:58 +03:00 |
|
zbeacon
|
616f6a8b4f
|
Changed Provision statuses
|
2020-10-06 17:17:50 +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 |
|
Andrii Shvaika
|
c9f3af73fd
|
Scheduler for Device Profile Alarms
|
2020-10-05 18:53:15 +03:00 |
|
Vladyslav_Prykhodko
|
77d2c786af
|
UI: Added device profile alarm conditional type
|
2020-10-05 18:18:46 +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 |
|