Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

#1812 Adjust label names for label service and URL #1861

Merged
merged 3 commits into from
Sep 11, 2019
Merged

#1812 Adjust label names for label service and URL #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac47d2
#1812 Adjust label names for label service and URL
corinagum Sep 10, 2019
abe24cf
Update CHANGELOG.md
corinagum Sep 10, 2019
c9f5615
Merge branch 'master' into corinagum/1812
corinagum Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1856](https://github.com/microsoft/BotFramework-Emulator/pull/1856)
- [1858](https://github.com/microsoft/BotFramework-Emulator/pull/1858)
- [1860](https://github.com/microsoft/BotFramework-Emulator/pull/1860)
- [1861](https://github.com/microsoft/BotFramework-Emulator/pull/1861)


- [client] Fixed an issue with the transcripts path input inside of the resource settings dialog in PR [1836](https://github.com/microsoft/BotFramework-Emulator/pull/1836)

Expand Down
4 changes: 2 additions & 2 deletions .../src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/connectedServiceEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ const labelMap = {
id: 'App ID',
instrumentationKey: 'App Insights Instrumentation Key',
kbId: 'Knowledge base ID',
name: 'Name',
name: 'Service Name',
region: 'Region',
resourceGroup: 'Azure Resource group',
serviceName: 'Azure Service Name',
subscriptionId: 'Azure Subscription ID',
subscriptionKey: 'Azure Subscription key',
tenantId: 'Azure Tenant ID',
url: 'URL',
url: 'Service URL',
version: 'Version',
...serviceTypeLabels,
};
Expand Down