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

803 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
39c2e3c39d UI: Fixed updated Alarm widget in change entity state parameters 2020-11-06 15:58:00 +02:00
deaflynx
bfab30b6d1 Code review. rule-chain.service minor code beautify 2020-11-04 10:14:08 +02:00
deaflynx
9581b9485f Code review. event.service minor code beautify 2020-11-04 09:32:34 +02:00
deaflynx
b5c6381eec Code review. entity.service Router minor refactoring 2020-11-04 08:44:48 +02:00
deaflynx
7d561fb0a4 Code review. entity-view.service beautify 2020-11-04 08:02:27 +02:00
deaflynx
6f6f6fb116 Code review. 1) edge.service: removed getTenantEdges, getCustomerEdges 2)service.completion.model.ts: code beautify 2020-11-04 08:00:27 +02:00
deaflynx
40feb8f6ec Code review: device.service beautify 2020-11-04 07:18:54 +02:00
deaflynx
f57bd5a10b Code review: dashboard.service beautify 2020-11-04 07:08:05 +02:00
deaflynx
a75fc2ea0d Fixed edge rule chains 2020-10-29 11:28:59 +02:00
Artem Babak
ae6e889a46 Edge and Core rulechains refactored types 2020-10-27 09:19:42 +02:00
Artem Babak
ac94a063ac Fixed fetch edge rule chains for 'rulechain' Node 2020-10-26 20:16:44 +02:00
Vladyslav_Prykhodko
c40f6bf47c UI: Added new options for legend config (sort datakeys in legend) 2020-10-23 18:42:07 +03:00
Artem Babak
fe9d58d3d3 Edge events implementation unfinished 2020-10-21 21:11:17 +03:00
Artem Babak
7a9ca169a2 Fetch Edge Rule Chains with this.route.url.includes('edges') 2020-10-21 10:34:52 +03:00
Artem Babak
74b150b384 Added getCustomerEdgeInfos() implementation 2020-10-21 05:40:25 +03:00
YevhenBondarenko
7e88376030 created alias ApiUsageState 2020-10-20 18:55:52 +03:00
Artem Babak
9cd0c45950 Fixed defaulEdgeRuleChains 2020-10-20 07:24:27 +03:00
Artem Babak
e393f3b51d Fixed Rule Chains page: openRuleChain(). Refactored getRuleNodeComponents() 2020-10-19 12:37:47 +03:00
Artem Babak
84a0604c08 Added getEdgesRuleChains(), type: ruleChainType.core 2020-10-18 11:15:11 +03:00
Artem Babak
b1c4c30317 Fixed fetchEdgeRuleChains. Added Downlink 2020-10-18 06:32:43 +03:00
Artem Babak
acfb6de884 Added Edge edgeLicenseKey and cloudEndpoint 2020-10-16 18:26:22 +03:00
Igor Kulikov
a29aa64497 Add OAuth2 settings menu to SysAdmin home page 2020-10-15 12:51:02 +03:00
Igor Kulikov
7565afca3a Several OAuth2 improvements 2020-10-14 16:43:07 +03:00
Igor Kulikov
e0ac59b94b UI: Device provisioning autogenerate device key and secret 2020-10-13 11:08:13 +03:00
Vladyslav_Prykhodko
6ef7e813fe UI: Added catch error get OAuth2 2020-10-13 10:02:30 +03:00
Vladyslav_Prykhodko
1f7623352a UI: refactoring OAuth2/Login Page and added oauth mapperType GITHUB 2020-10-12 18:11:22 +03:00
Volodymyr Babak
dd780d05df Merge remote-tracking branch 'origin/master' into feature/3.0-edge 2020-10-12 12:00:54 +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
7640d32d3b Fix conflicts 2020-10-12 10:18:43 +03:00
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +03:00
Igor Kulikov
48c0c9fd8f
Merge pull request #3559 from ChantsovaEkaterina/bug/missed-custom-translations-in-labels 
Add missed custom translations for key labels
 2020-10-12 09:12:42 +03:00
Chantsova Ekaterina
e2b955299e Add missed custom translations for key labels 2020-10-08 19:58:39 +03:00
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +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
Igor Kulikov
98227ea665 Merge branch 'master' into develop/3.2 2020-10-06 19:06:35 +03:00
Chantsova Ekaterina
aa82a478cb Fix wrong number of digits after floating point in legend 2020-10-06 18:44:12 +03:00
Vladyslav_Prykhodko
fe00a9bd45 UI: Added support multiple domains is OAuth2 settings 2020-10-05 11:09:41 +03:00
Vladyslav_Prykhodko
f2af7d0831 UI add device wizard 2020-09-29 15:47:17 +03:00
Vladyslav_Prykhodko
556cb5aa5d Refactoring OAuth2 2020-09-21 16:10:00 +03:00
Vladyslav_Prykhodko
4c07e72117 Refactoring 2020-09-21 14:00:13 +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
692f575661 Merge with master 2020-09-16 12:12:59 +03:00
Vladyslav_Prykhodko
70ca190f59 UI add rule-chain autocompleted 2020-09-15 19:51:57 +03:00
Chantsova Ekaterina
b0372b3525 Fix hiding keys in legend 2020-09-15 19:51:40 +03:00
Vladyslav_Prykhodko
dc77426dab Added field id in model MenuSection and BreadCrumb 2020-09-15 12:20:19 +03:00
Igor Kulikov
d9321b4816 UI: Device profile alarm rules 2020-09-10 19:37:14 +03:00
Vladyslav_Prykhodko
edcaebe9ac Refactoring layout oauth2 templated 2020-09-07 17:19:12 +03:00
Igor Kulikov
af77d57768 Merge with master 2020-09-07 15:15:41 +03:00