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

5198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vzikratyi
2db74b25a4 Removed 'name' from Github OAuth2 template 2020-10-09 10:37:28 +03:00
zbeacon
6683158c6b Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 09:53:08 +03:00
zbeacon
d032b0a3f7 Adding tests 2020-10-09 09:28:04 +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
Chantsova Ekaterina
e2b955299e Add missed custom translations for key labels 2020-10-08 19:58:39 +03:00
vzikratyi
ac055397b0 Added GITHUB mapper type 2020-10-08 18:22:16 +03:00
Igor Kulikov
e10696087e Merge branch 'master' into feature/wizard 2020-10-08 17:51:38 +03:00
zbeacon
6b72e82104 Improvement 2020-10-08 17:30:35 +03:00
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +03:00
zbeacon
17ca3cfab4 Refactoring 2020-10-08 16:51:28 +03:00
Chantsova Ekaterina
aa87ab024e Change widget json config 2020-10-08 16:21:04 +03:00
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
ea9d18e32d Removed upper-case from providerId 2020-10-08 15:59:51 +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
d1167bca0f Merge branch 'feature/device-provision-3.2-onlyProfileVersion' of https://github.com/zbeacon/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-08 15:16:44 +03:00
zbeacon
adf5069da1 Added ability to provision credentials type from device using provision feature 2020-10-08 15:08:29 +03:00
Igor Kulikov
40e13cceb8 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-08 13:25:17 +03:00
Igor Kulikov
dfbc3c3e2d Fix nav tree component - run callbacks in angular zone 2020-10-08 13:25:01 +03:00
Vladyslav_Prykhodko
8dfc287342 Added device profile rule node UI settings 2020-10-08 13:05:05 +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
Igor Kulikov
c4b89e29ef Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-08 11:46:01 +03:00
Igor Kulikov
305ec3067e Update angular version 2020-10-08 11:45:50 +03:00
Andrii Shvaika
77d754ad90 Fetch Last Level Only improvement 2020-10-08 11:45:01 +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
059b456f70 Move device/tenant profile entitiy type enums to the end of list. 2020-10-08 09:20:35 +03:00
Igor Kulikov
7db6158279 Increase MQTT attributes/timeseries tests timeouts. 2020-10-07 19:18:06 +03:00
Igor Kulikov
795e1fd634 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-07 18:53:24 +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
Andrii Shvaika
276397d9d0 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-07 15:43:58 +03:00
Andrii Shvaika
15743bcf91 Fetch Last Level Only + Distinct values 2020-10-07 15:43:47 +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
Andrii Shvaika
5dd460b81d Some improvements 2020-10-07 14:13:25 +03:00
Dima Landiak
401bb3ff17 fix db name in yml 2020-10-07 13:46:37 +03:00
vzikratyi
91f05282ea Validate domains for SchemeTypes combinations 2020-10-07 13:06:22 +03:00
Illia Barkov
ab9199d8b8
Update locale.constant-en_US.json 2020-10-07 12:56:35 +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