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

1495 Commits

Author SHA1 Message Date
Andrii Shvaika
b38b47f409 JS Invoke Service stats 2020-10-22 18:51:34 +03:00
Andrii Shvaika
0b83ae8b9a Merge branch 'feature/usage-records' of github.com:thingsboard/thingsboard into feature/usage-records 2020-10-22 15:56:38 +03:00
Andrii Shvaika
0e0ab6ca39 Improvements to API State 2020-10-22 15:56:31 +03:00
YevhenBondarenko
41212e11c0 created tenant profile configuration 2020-10-22 15:50:12 +03:00
Volodymyr Babak
cee4e5e8d8 Improve logging 2020-10-22 14:27:34 +03:00
Volodymyr Babak
173eda71ed Fixed fetch without TS updates 2020-10-22 13:46:37 +03:00
Volodymyr Babak
fd5367b51f Code review changes 2020-10-22 13:10:18 +03:00
Artem Babak
74b150b384 Added getCustomerEdgeInfos() implementation 2020-10-21 05:40:25 +03:00
YevhenBondarenko
42dd386182 Merge branch 'feature/usage-records' of https://github.com/thingsboard/thingsboard into feature/usage-records 2020-10-20 19:30:41 +03:00
Andrii Shvaika
9d14a38966 Tenant Profile updates for ApiUsageStateService 2020-10-20 18:57:15 +03:00
YevhenBondarenko
7e88376030 created alias ApiUsageState 2020-10-20 18:55:52 +03:00
Andrii Shvaika
9ec4b77672 Improvements to ApiUsageState persistence 2020-10-20 15:50:04 +03:00
Artem Babak
c1fe4a5dde Removed duplicated line in CustomerServiceImpl.java 2020-10-20 13:44:42 +03:00
Volodymyr Babak
d825a2a6be Code review changes 2020-10-20 12:12:54 +03:00
Volodymyr Babak
055a91fca1 EdgeEventActionType introduced 2020-10-20 11:36:28 +03:00
Andrii Shvaika
b598a73954 Renaming of UsageRecord to ApiUsageState 2020-10-19 19:51:58 +03:00
Andrii Shvaika
2e694e1d64 Dao layer for UsageRecords 2020-10-19 15:39:15 +03:00
Volodymyr Babak
7af1c86e17 Merge branch 'develop/2.5.5' into feature/edge 2020-10-18 15:33:45 +03:00
Igor Kulikov
9a7d5a437e Fix OAuth2 domain params order 2020-10-14 18:22:03 +03:00
Igor Kulikov
7565afca3a Several OAuth2 improvements 2020-10-14 16:43:07 +03:00
Igor Kulikov
da7d88470e
Merge pull request #3575 from vvlladd28/improvement/oauth2 
Improvement OAuth2
 2020-10-13 10:47:20 +03:00
Igor Kulikov
19b8464937 Merge device provisioning feature 2020-10-12 19:39:47 +03:00
Vladyslav_Prykhodko
1c2ec66f16 Merge remote-tracking branch 'upstream/master' into improvement/oauth2 2020-10-12 18:11:44 +03:00
Igor Kulikov
40be6e588c Fix device wizard dialog. Fix install script for oauth2 client registration templates. 2020-10-12 18:05:26 +03:00
vzikratyi
4952c310a4 Added mapperConfig to OAuth2Template 2020-10-12 17:34:49 +03:00
Volodymyr Babak
9ba62199a8 Disabled temporary edge sql test 2020-10-12 17:31:04 +03:00
Volodymyr Babak
0974191172 Test fixed 2020-10-12 16:54:05 +03:00
Volodymyr Babak
95786f858c Merge remote-tracking branch 'origin/feature/edge' into feature/3.0-edge 2020-10-12 15:19:06 +03:00
Andrii Shvaika
6d185f1c01 Improvements to device profile rule node 2020-10-12 14:29:20 +03:00
zbeacon
005ad70657 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-12 13:57:01 +03:00
zbeacon
ca4e9238c8 Fix for device provision tests 2020-10-12 13:30:23 +03:00
Volodymyr Babak
dd780d05df Merge remote-tracking branch 'origin/master' into feature/3.0-edge 2020-10-12 12:00:54 +03:00
Volodymyr Babak
ba96409e5d Code review fixes 2020-10-12 11:26:37 +03:00
Volodymyr Babak
ee6bc5ec4b Fixed issue for last level query in case entities have more relations in the hierarchy below requested level 2020-10-12 11:26:37 +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
zbeacon
35f6f40ca3 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 17:35:30 +03:00
zbeacon
93278f7236 Refactoring according to comments 2020-10-09 17:32:32 +03:00
Volodymyr Babak
160fd94666 Moved service to base class. Change sync button icon 2020-10-09 15:47:59 +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
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
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
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
Andrii Shvaika
77d754ad90 Fetch Last Level Only improvement 2020-10-08 11:45:01 +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
d508bb671b Automatic update of the root rule chain in 3.2 2020-10-08 10:57:48 +03:00
Andrii Shvaika
15743bcf91 Fetch Last Level Only + Distinct values 2020-10-07 15:43:47 +03:00
vzikratyi
91f05282ea Validate domains for SchemeTypes combinations 2020-10-07 13:06:22 +03:00