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

726 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Andrii Shvaika
1278339e61 DeviceProfileRuleNode 2020-10-05 15:09:57 +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
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
ShvaykaD
9fef6b02a3
[3.2] Feature/Proto Converter (#3423) 
* device post-telemetry & post-attributes & claim

* device rpc to/from server & attributes request, attributes updates

* refactoring & added implementation for gateway protos api

* added timeseries/attributes mqtt tests

* fix MqttTimseriesIntegrationTest values asserts

* mqtt attributes tests improvements

* optimized time for telemetry & attributes tests

* update proto files, refactoring converter, attribute requests tests

* added claim tests, attribute request test

* added deleted keys to gateway response on attributes request & refactored tests

* added attribute updates test & refactored attribute requests tests

* added attribute updates tests for gateways

* added tests for RPC

* fix tests & cleanup code

* fix typo & cleanup transport.proto file

* added more timeouts

* revert handleGetAttributesRequest method

* revert package-locks

* fix getJsonObjectForGateway method

* fix validateSharedResponseGateway method in AbstractMqttAttributesRequestIntegrationTest

* fix mqtt topics

* fix license headers

* refactor tests

* remove todo and lck files from pull

* improvements for claiming tests

* update device creation logic from gateway request

* refactoring

* extract TransportService process calls to private methods

* fix duplicates & removed empty lines
 2020-10-02 11:31:27 +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
e41d69b1a8 shared Attributes update improvements (If the update of the shared attributes is originated by the user's REST API call - we push it to the device, if the update arrives from the device, we will not push it back to the device by default.) 2020-09-30 12:24:39 +03:00
Andrii Shvaika
85643636ab Implemented main functionality 2020-09-29 17:55:43 +03:00
Vladyslav_Prykhodko
e740e4368a Added parameter filter for transport type in deviceProfile API 2020-09-29 10:18:32 +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
5275a3302a Added 'additionalInfo' to ClientRegistration 2020-09-18 11:19:41 +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
Vladyslav_Prykhodko
d5cfccc1cb Updated license header 2020-09-17 10:36:50 +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
2cd61fe6bb Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-16 16:18:30 +03:00
Andrii Shvaika
f67860bb09 Device Profile Rule Node 2020-09-16 16:16:31 +03:00
Igor Kulikov
f3e52cbd3b Merge branch 'master' into develop/3.2 2020-09-16 12:15:51 +03:00
Igor Kulikov
e7c1901346 Merge branch 'develop/2.5.5' 2020-09-16 12:15:33 +03:00
Igor Kulikov
10a3f26905
Merge pull request #3474 from YevhenBondarenko/develop/2.5.5-mqtt-transport 
MqttTransportHandler improvements
 2020-09-16 12:14:43 +03:00
Igor Kulikov
692f575661 Merge with master 2020-09-16 12:12:59 +03:00
Igor Kulikov
827a1e3092
Merge pull request #3406 from ShvaykaD/improvements/queue-reprocessing-strategy-3.2 
[3.2] Improvements/queue reprocessing strategy
 2020-09-16 12:08:59 +03:00
Igor Kulikov
7604b78f0e
Merge pull request #3405 from ShvaykaD/improvements/queue-reprocessing-strategy 
[2.5.5] Improvements/queue reprocessing strategy
 2020-09-16 12:08:44 +03:00
YevhenBondarenko
e3957ea2aa MqttTransportHandler improvements 2020-09-15 18:29:54 +03:00
Andrii Shvaika
4a3b28d331 Method to create default rule chain for device profile 2020-09-15 18:17:06 +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