dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2019-12-23 19:21:38 +02:00
commit a77cefddd0
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msa/js-executor/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "thingsboard-js-executor", "name": "thingsboard-js-executor",
"private": true, "private": true,
"version": "2.5.0", "version": "2.4.3",
"description": "ThingsBoard JavaScript Executor Microservice", "description": "ThingsBoard JavaScript Executor Microservice",
"main": "server.js", "main": "server.js",
"bin": "server.js", "bin": "server.js",

2
msa/web-ui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "thingsboard-web-ui", "name": "thingsboard-web-ui",
"private": true, "private": true,
"version": "2.5.0", "version": "2.4.3",
"description": "ThingsBoard Web UI Microservice", "description": "ThingsBoard Web UI Microservice",
"main": "server.js", "main": "server.js",
"bin": "server.js", "bin": "server.js",

2
ui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "thingsboard", "name": "thingsboard",
"private": true, "private": true,
"version": "2.5.0", "version": "2.4.3",
"description": "ThingsBoard UI", "description": "ThingsBoard UI",
"licenses": [ "licenses": [
{ {

6
ui/src/app/components/datasource-entity.tpl.html
View File

@ -44,7 +44,7 @@
<ng-md-icon size="16" icon="alpha-a-circle-outline"></ng-md-icon> <ng-md-icon size="16" icon="alpha-a-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="item.type==types.dataKeyType.entityField"> <span ng-show="item.type==types.dataKeyType.entityField">
<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip> <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
<ng-md-icon size="16" icon="alpha-e-circle-outline"></ng-md-icon> <ng-md-icon size="16" icon="alpha-e-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="item.type==types.dataKeyType.timeseries"> <span ng-show="item.type==types.dataKeyType.timeseries">
@ -65,7 +65,7 @@
<ng-md-icon size="16" icon="alpha-a-circle-outline" ng-click="createKey($event, types.dataKeyType.attribute, '#datakey_chips')"></ng-md-icon> <ng-md-icon size="16" icon="alpha-a-circle-outline" ng-click="createKey($event, types.dataKeyType.attribute, '#datakey_chips')"></ng-md-icon>
</span> </span>
<span ng-show="widgetType == types.widgetType.latest.value"> <span ng-show="widgetType == types.widgetType.latest.value">
<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip> <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
<ng-md-icon size="16" icon="alpha-e-circle-outline" ng-click="createKey($event, types.dataKeyType.entityField, '#datakey_chips')"></ng-md-icon> <ng-md-icon size="16" icon="alpha-e-circle-outline" ng-click="createKey($event, types.dataKeyType.entityField, '#datakey_chips')"></ng-md-icon>
</span> </span>
<span> <span>
@ -91,7 +91,7 @@
<ng-md-icon size="20" icon="alpha-a-circle-outline"></ng-md-icon> <ng-md-icon size="20" icon="alpha-a-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="$chip.type==types.dataKeyType.entityField"> <span ng-show="$chip.type==types.dataKeyType.entityField">
<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip> <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
<ng-md-icon size="20" icon="alpha-e-circle-outline"></ng-md-icon> <ng-md-icon size="20" icon="alpha-e-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="$chip.type==types.dataKeyType.timeseries"> <span ng-show="$chip.type==types.dataKeyType.timeseries">

1
ui/src/app/locale/locale.constant-en_US.json
View File

@ -583,6 +583,7 @@
"configuration": "Data key configuration", "configuration": "Data key configuration",
"timeseries": "Timeseries", "timeseries": "Timeseries",
"attributes": "Attributes", "attributes": "Attributes",
"entity-field": "Entity field",
"alarm": "Alarm fields", "alarm": "Alarm fields",
"timeseries-required": "Entity timeseries are required.", "timeseries-required": "Entity timeseries are required.",
"timeseries-or-attributes-required": "Entity timeseries/attributes are required.", "timeseries-or-attributes-required": "Entity timeseries/attributes are required.",

1
ui/src/app/locale/locale.constant-ru_RU.json
View File

@ -583,6 +583,7 @@
"configuration": "Конфигурация ключа данных", "configuration": "Конфигурация ключа данных",
"timeseries": "Телеметрия", "timeseries": "Телеметрия",
"attributes": "Атрибуты", "attributes": "Атрибуты",
"entity-field": "Поле объекта",
"alarm": "Параметры оповещения", "alarm": "Параметры оповещения",
"timeseries-required": "Телеметрия объекта обязательна.", "timeseries-required": "Телеметрия объекта обязательна.",
"timeseries-or-attributes-required": "Телеметрия/атрибуты обязательны.", "timeseries-or-attributes-required": "Телеметрия/атрибуты обязательны.",

1
ui/src/app/locale/locale.constant-uk_UA.json
View File

@ -699,6 +699,7 @@
"configuration": "Конфігурація ключа даних", "configuration": "Конфігурація ключа даних",
"timeseries": "Телеметрія", "timeseries": "Телеметрія",
"attributes": "Атрибути", "attributes": "Атрибути",
"entity-field": "Поле сутності",
"alarm": "Поля сигнала тривоги", "alarm": "Поля сигнала тривоги",
"timeseries-required": "Необхідно вказати Телеметрія.", "timeseries-required": "Необхідно вказати Телеметрія.",
"timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.", "timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.",