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

201 Commits

Author SHA1 Message Date
Igor Kulikov
c7b57ca543 Add Device Wizard improvements 2020-10-09 17:19:51 +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
e8220e5102 Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-07 10:36:15 +03:00
Vladyslav_Prykhodko
fd602dec7f UI: Added device profile schedule setting for alarm setting 2020-10-06 19:22:40 +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
Vladyslav_Prykhodko
77d2c786af UI: Added device profile alarm conditional type 2020-10-05 18:18:46 +03:00
Vladyslav_Prykhodko
fe00a9bd45 UI: Added support multiple domains is OAuth2 settings 2020-10-05 11:09:41 +03:00
zbeacon
dd0ab34625 Merge from develop/3.2 2020-10-05 08:54:44 +03:00
Vladyslav Prykhodko
e8d8382c74 UI: Added device provision to device profile 2020-10-04 00:05:52 +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
Vladyslav_Prykhodko
1d61b4f439 UI: Device profile alarm rules added dynamic source type - current device 2020-09-29 18:31:17 +03:00
Vladyslav_Prykhodko
1f3bae922e UI updated OAuth2 for new endpoint 2020-09-21 10:53:42 +03:00
Vladyslav_Prykhodko
ae92f065e6 Add select login provider templated 2020-09-17 10:31:35 +03:00
Igor Kulikov
c4e6721596 UI: Device profile alarm rules improvements 2020-09-14 15:33:01 +03:00
Igor Kulikov
3a830eeb9a UI: Device profile alarm rules 2020-09-11 19:27:29 +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
Vladyslav_Prykhodko
6e492c78d1 Change device credentials value type 2020-09-10 15:37:25 +03:00
Vladyslav_Prykhodko
44b0a1100f Add new device credentials MQTT_BASIC 2020-09-10 15:14:37 +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
Vladyslav_Prykhodko
44a5500c7d Remove device profile rpc topic filter 2020-09-09 17:56:02 +03:00
Vladyslav_Prykhodko
edcaebe9ac Refactoring layout oauth2 templated 2020-09-07 17:19:12 +03:00
Vladyslav_Prykhodko
45fc8feddc Add mqtt device topic filters UI 2020-09-04 15:15:09 +03:00
Igor Kulikov
06573211b3 UI: Improve device profile/data 2020-09-03 17:43:53 +03:00
Igor Kulikov
1e87c72818 UI: Device profile autocomplete. Device profile data. 2020-09-03 14:14:46 +03:00
Igor Kulikov
3adbb481a1 UI: Device profile transport configuration 2020-09-03 12:51:54 +03:00
Igor Kulikov
cc018f8876 UI: Device profiles 2020-09-02 18:32:57 +03:00
Igor Kulikov
cf4e1a4bd9 UI: Inline tenant profile create/edit. 2020-09-01 18:41:42 +03:00
Igor Kulikov
8c98f271fa Merge branch 'master' into develop/3.2 2020-09-01 14:56:03 +03:00
Vladyslav_Prykhodko
ff892300d0 Add services completion 2020-08-31 16:54:07 +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
f39d663827 UI: Tenant Profiles 2020-08-27 19:32:15 +03:00
Igor Kulikov
541091a221 Minor fixes 2020-08-26 19:20:58 +03:00
Igor Kulikov
38847216cd Merge branch 'master' into develop/3.2 2020-08-26 16:08:45 +03:00
Igor Kulikov
868234f13d Tenant, device profiles UI 2020-08-26 15:00:11 +03:00
Chantsova Ekaterina
f7b867a10c Correct services arguments 2020-08-25 19:47:43 +03:00
Chantsova Ekaterina
156f7d6ae7 Correct mistakes in descriptions 2020-08-25 17:16:09 +03:00
Chantsova Ekaterina
74dd5fbb98 Change formatting 2020-08-25 11:38:21 +03:00
Igor Kulikov
dddbe34f1b Improve modules loading 2020-08-17 16:11:01 +03:00
Igor Kulikov
1533a95fa1 Upgrade angular to 10 2020-08-13 19:00:48 +03:00
Igor Kulikov
e7aae9664a Add new alias entity type - Current User Owner 2020-08-10 15:34:23 +03:00
Igor Kulikov
c1b53afd8a Add entity description to datasource. Fix map markers color. 2020-08-10 14:34:05 +03:00
Vladyslav_Prykhodko
b9125827a1 Add completion 2020-08-06 19:19:53 +03:00
Igor Kulikov
1dd815fe64 Minor fixes 2020-08-05 16:43:21 +03:00
Kalutka Zhenya
225682f646 Update service-completion.models 2020-08-05 14:55:16 +03:00
Kalutka Zhenya
8daf57df39 Update service-completion.models() 2020-08-05 14:55:16 +03:00
Vladyslav_Prykhodko
b405d08e1c Fixed not correct help link to customer info 2020-08-04 12:14:17 +03:00
vzikratyi
ad04ad79ec Merge branch 'master' into feature/dynamic-oauth2 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
#	dao/src/main/resources/sql/schema-entities-hsql.sql
 2020-08-03 15:08:26 +03:00
Andrii Shvaika
9e331a1768 Merge with 2.5.3 2020-08-03 11:04:50 +03:00