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

2343 Commits

Author SHA1 Message Date
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
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
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
zbeacon
4494f3dd67 Fix for tests 2020-10-07 12:10:05 +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
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
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
zbeacon
dc99576113 Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-06 18:29:26 +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
6d0dc981a0 Adding tests for device provisioning feature 2020-10-06 18:28:44 +03:00
zbeacon
616f6a8b4f Changed Provision statuses 2020-10-06 17:17:50 +03:00
Bohdan Smetaniuk
a7a7cb2ad5 fixed bug with extra UserCredentialsUpdataMsg 2020-10-06 14:25:07 +03:00
Andrii Shvaika
d04a5195ac Ignore for invalid tests 2020-10-06 12:51:06 +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
zbeacon
fd80cda30a Added TbCoreComponent annotation 2020-10-06 09:50:47 +03:00
Bohdan Smetaniuk
6081ed1ad0 fixed message amount 2020-10-05 18:15:36 +03:00
Bohdan Smetaniuk
97d2d66151 test coverage for Customer, EntityView, WidgetsBundle, WidgetType entities + request messages 2020-10-05 16:53:11 +03:00
Andrii Shvaika
0675c7cf4c Adding rule node state table to the upgrade 2020-10-05 15:28:45 +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
Bohdan Smetaniuk
8ad8e2d797 refactored imports 2020-10-05 12:04:49 +03:00
Bohdan Smetaniuk
74a69d8a1e test for sync Edge 2020-10-05 12:02:20 +03:00
Bohdan Smetaniuk
1d89cbc191 Merge branch 'feature/edge' of https://github.com/volodymyr-babak/thingsboard into feature/sync_edge_from_controller 2020-10-05 11:34:40 +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
Bohdan Smetaniuk
898b7570a5 fixes 2020-10-05 11:07:32 +03:00
zbeacon
6eac10d60c Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-05 09:19:01 +03:00
zbeacon
8c9dda1b4d Added ability to provision device using protobuf 2020-10-05 08:51:51 +03:00
Bohdan Smetaniuk
e09b97100b tests refactored 2020-10-02 19:29:35 +03:00
Andrii Shvaika
080a5f1587 Rule Node States 2020-10-02 17:55:40 +03:00
Bohdan Smetaniuk
773b856c25 tested attributes updated/post attributes separation 2020-10-02 15:34:54 +03:00
Bohdan Smetaniuk
51cbdf6622 Merge branch 'feature/edge' of https://github.com/volodymyr-babak/thingsboard into testing 2020-10-02 14:28:37 +03:00