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

1654 Commits

Author SHA1 Message Date
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
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
Igor Kulikov
cb9f5cde85
Merge pull request #3561 from ChantsovaEkaterina/improvement/extend-multiple-input-settings 
Multiple input widget: extend settings
 2020-10-12 09:13:50 +03:00
ShvaykaD
d5bf25e2f3 revert the enqueue(root rule chain) method changes 2020-10-09 18:44:37 +03:00
ShvaykaD
a045be771b added null check for queueName 2020-10-09 18:44:37 +03:00
ShvaykaD
0240476b4e fix duplicates 2020-10-09 18:44:37 +03:00
YevhenBondarenko
8e89ea9729 refactored 2020-10-09 18:44:37 +03:00
YevhenBondarenko
a046459d62 added deviceCreationTime to the DeviceStateData 2020-10-09 18:44:37 +03:00
YevhenBondarenko
fc92a8d536 fixed sending inactivity event after device creation. 2020-10-09 18:44:37 +03:00
YevhenBondarenko
d838f2a867 fix NPE in DefaultTbDeviceProfileCache 2020-10-09 18:41:14 +03:00
vzikratyi
2db74b25a4 Removed 'name' from Github OAuth2 template 2020-10-09 10:37:28 +03:00
Chantsova Ekaterina
db0b0dcb30 Merge remote-tracking branch 'upstream/master' into improvement/extend-multiple-input-settings 2020-10-08 20:05:29 +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
Chantsova Ekaterina
aa87ab024e Change widget json config 2020-10-08 16:21:04 +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
90234bf7a3 Fixed merge 2020-10-08 11:37:04 +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
Andrii Shvaika
0cc52cd129 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-08 10:57:58 +03:00
Andrii Shvaika
d508bb671b Automatic update of the root rule chain in 3.2 2020-10-08 10:57:48 +03:00
Igor Kulikov
3c9a335910 Tests fix 2020-10-08 09:46:52 +03:00
Igor Kulikov
7db6158279 Increase MQTT attributes/timeseries tests timeouts. 2020-10-07 19:18:06 +03:00
Igor Kulikov
54b609e8bd Fix Tenant Actor: Ack transport to device message when no tenant exists. Improve MQTT tests. 2020-10-07 18:53:10 +03:00
Igor Kulikov
bc50ef88a6 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-07 15:42:32 +03:00
Igor Kulikov
1abf320c99 Set spring.freemarker.checkTemplateLocation to false 2020-10-07 15:42:17 +03:00
Andrii Shvaika
931c740993 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-07 15:17:17 +03:00
Andrii Shvaika
dfd0d2685b Fix issue with locks 2020-10-07 15:17:06 +03:00
Dima Landiak
401bb3ff17 fix db name in yml 2020-10-07 13:46:37 +03:00
Andrii Shvaika
7b3d903cff Merge with develop 2.5.5 2020-10-07 12:11:37 +03:00
Andrew Shvayka
0356431856
Merge pull request #3548 from ShvaykaD/improvements/TbSendRPCRequestNode 
[2.5.5] fix enqueue methods impl in DefaultTbContext
 2020-10-07 12:06:51 +03:00
Andrii Shvaika
de9cd8939e Fix for client certificate check 2020-10-07 12:06:24 +03:00
Igor Kulikov
907ed5ad83 Update upgrade scripts 2020-10-07 10:33:47 +03:00
Vladyslav_Prykhodko
fd602dec7f UI: Added device profile schedule setting for alarm setting 2020-10-06 19:22:40 +03:00
ShvaykaD
7cfa97ab5e refactoring 2020-10-06 19:04:54 +03:00
ShvaykaD
94bb9f5be3 update the fix in the API 2020-10-06 18:59:18 +03:00
Andrii Shvaika
d04a5195ac Ignore for invalid tests 2020-10-06 12:51:06 +03:00
Andrii Shvaika
c0934b959b Fix for Cassandra Unit 2020-10-06 12:40:29 +03:00
Andrii Shvaika
0675c7cf4c Adding rule node state table to the upgrade 2020-10-05 15:28:45 +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
1f1cc84a92 Changed getting redirectUri 2020-10-01 18:43:44 +03:00
vzikratyi
6b41fb9c0e Refactored and used MiscUtils 2020-10-01 18:06:20 +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