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

327 Commits

Author SHA1 Message Date
ShvaykaD
64cc74c26c cleanup code 2020-10-13 13:57:38 +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
Andrii Shvaika
6d185f1c01 Improvements to device profile rule node 2020-10-12 14:29:20 +03:00
Igor Kulikov
8cfbcee05e Minor fixes 2020-10-12 10:58:28 +03:00
vzikratyi
ac055397b0 Added GITHUB mapper type 2020-10-08 18:22:16 +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
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
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
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
Andrii Shvaika
4a3b28d331 Method to create default rule chain for device profile 2020-09-15 18:17:06 +03:00
Andrii Shvaika
4d012ac62d DeviceProfile rule node draft 2020-09-15 16:13:39 +03:00
Igor Kulikov
969a686c74 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-10 19:37:26 +03:00
Igor Kulikov
d9321b4816 UI: Device profile alarm rules 2020-09-10 19:37:14 +03:00
Andrii Shvaika
a3326b4464 New type of credentials: MQTT 2020-09-10 17:17:42 +03:00
Igor Kulikov
3b55ebe5d4 Fix conflicts 2020-09-09 18:29:06 +03:00
Igor Kulikov
79e06fbbe7 UI: Device profile alarm rules 2020-09-09 18:27:28 +03:00
Andrii Shvaika
ad273deace Custom MQTT Topic filters in device profile 2020-09-09 17:26:35 +03:00
Andrii Shvaika
f3a5cb3162 AlarmRules 2020-09-08 18:06:48 +03:00
Andrii Shvaika
d440d500e5 Mqtt Transport Configuration 2020-09-03 18:38:11 +03:00
Igor Kulikov
06573211b3 UI: Improve device profile/data 2020-09-03 17:43:53 +03:00
Andrii Shvaika
df823c8f90 Merge with UI changes 2020-09-02 19:10:46 +03:00
Andrii Shvaika
22755e8763 Device Profile implementation for Transport 2020-09-02 18:52:59 +03:00
Igor Kulikov
73a988b541 Add tenant profile data 2020-09-02 12:19:35 +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
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
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
Igor Kulikov
ad87924437 Tenant and Device profile improvements 2020-08-20 19:44:29 +03:00