ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 00:30:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 (#9385)

Browse Source 
* Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127

* distro
This commit is contained in:
Anthony Dresser
2020-02-28 00:37:06 -08:00
committed by GitHub
parent 70851716f7
commit 5d13ebf0d2
143 changed files with 1711 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
View File

@@ -87,7 +87,8 @@ Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegis
name: localize('extensions', "Extensions"),
ctorDescriptor: new SyncDescriptor(ExtensionsViewPaneContainer),
icon: 'codicon-extensions',
order: 14 // {{SQL CARBON EDIT}}
order: 14, // {{SQL CARBON EDIT}}
rejectAddedViews: true,
}, ViewContainerLocation.Sidebar);

2
src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
View File

@@ -2690,7 +2690,7 @@ export class SystemDisabledWarningAction extends ExtensionAction {
if (server) {
this.tooltip = localize('Install in other server to enable', "Install the extension on '{0}' to enable.", server.label);
} else {
this.tooltip = localize('disabled because of extension kind', "This extension cannot be enabled in the remote server.");
this.tooltip = localize('disabled because of extension kind', "This extension has defined that it cannot run on the remote server");
}
return;
}