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

1499 Commits

Author SHA1 Message Date
ShvaykaD
18a57d638d merge with master 2020-11-11 18:25:29 +02:00
Igor Kulikov
a5e8cab5e0
Merge pull request #3700 from YevhenBondarenko/feature/api-usage-state-tmp 
api usage state alias improvements
 2020-11-11 14:03:40 +02:00
YevhenBondarenko
ebf10b55c8 api usage state alias improvements 2020-11-11 12:59:22 +02:00
Viacheslav Kukhtyn
c3ee6785aa Merge branch 'master' into feature/log-telemetry-updated 2020-11-11 11:44:42 +02:00
Igor Kulikov
c97aaf099e
Merge pull request #3689 from ChantsovaEkaterina/improvement/get-timeseries-method 
Add getEntityTimeseries method to Attributes Service
 2020-11-11 09:07:43 +02:00
Igor Kulikov
d52a0d368a
Merge pull request #3653 from vvlladd28/bug/device-profile/show-scheduler-time 
UI: Fixed show not correct time for device profiles scheduler preview
 2020-11-11 09:03:26 +02:00
Igor Kulikov
1ba09a5006
Merge pull request #3627 from vvlladd28/improvement/legend-sort 
UI: Added new options for legend config (sort datakeys in legend)
 2020-11-11 09:02:26 +02:00
Chantsova Ekaterina
ae8686605f Refactoring 2020-11-09 15:54:05 +02:00
Chantsova Ekaterina
d40f5823ff Add getEntityTimeseries method to Attributes Service 2020-11-09 15:18:37 +02:00
Andrii Shvaika
3518a3d927 Merge with master 2020-11-09 10:42:47 +02:00
Artem Babak
ad91c68e11 Rule Chains routing refactored 2020-11-06 17:52:40 +02:00
Artem Babak
6ac70dd76e edgeEventStatusColor refactored 2020-11-05 16:52:37 +02:00
Artem Babak
d6b10c9409 alias.models.ts removed unused line 2020-11-05 16:43:03 +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
Vladyslav_Prykhodko
b9950d82e9 UI: Fixed show not correct time for device profiles scheduler preview 2020-10-29 14:10:05 -04:00
ShvaykaD
37c381996e ui updates 2020-10-29 14:58:28 +02:00
deaflynx
a75fc2ea0d Fixed edge rule chains 2020-10-29 11:28:59 +02:00
YevhenBondarenko
7724495cb1 added default queue for device profile 2020-10-28 17:20:53 +02:00
Artem Babak
ae6e889a46 Edge and Core rulechains refactored types 2020-10-27 09:19:42 +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
74277323bd EdgeEvents with Status 2020-10-23 15:18:34 +03:00
Artem Babak
e7b153b937 EdgeEvents without Status 2020-10-23 11:47:21 +03:00
Viacheslav Kukhtyn
0fc43c3bd4 Add 'Timeseries Updated' into message type switch node 2020-10-23 11:42:00 +03:00
YevhenBondarenko
41212e11c0 created tenant profile configuration 2020-10-22 15:50:12 +03:00
deaflynx
d5d5629430 EdgeEvents implementation unfinished 2020-10-22 12:25:43 +03:00
Artem Babak
fe9d58d3d3 Edge events implementation unfinished 2020-10-21 21:11:17 +03:00
YevhenBondarenko
7e88376030 created alias ApiUsageState 2020-10-20 18:55:52 +03:00
Artem Babak
f1b58a9df1 Fixed and refactored customer edges 2020-10-20 12:04:13 +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
ed090b3e6c UI: Improve dialog actions style 2020-10-14 12:32: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
Vladyslav_Prykhodko
1f7623352a UI: refactoring OAuth2/Login Page and added oauth mapperType GITHUB 2020-10-12 18:11:22 +03:00
Igor Kulikov
155b967b47 Improve device profile alarm rules UI 2020-10-12 17:29:27 +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
Volodymyr Babak
dd780d05df Merge remote-tracking branch 'origin/master' into feature/3.0-edge 2020-10-12 12:00:54 +03:00
Igor Kulikov
8cfbcee05e Minor fixes 2020-10-12 10:58:28 +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
Igor Kulikov
20c90c8a6f Improve device/device profile components, remove unnecessary transport configurations 2020-10-12 10:12:42 +03:00
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +03:00
Vladyslav_Prykhodko
30a6a462da UI: Improvement view device profile settings 2020-10-09 18:11:49 +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
Igor Kulikov
c7b57ca543 Add Device Wizard improvements 2020-10-09 17:19:51 +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
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
Vladyslav_Prykhodko
fd602dec7f UI: Added device profile schedule setting for alarm setting 2020-10-06 19:22:40 +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