Skip to content

Conversation

DonJayamanne
Copy link

@DonJayamanne DonJayamanne commented Mar 16, 2020

Disable API, then merge ds/custom_editor into master.
Then revert this PR in ds/custom_editor.

This is to keep master updated with fixes from ds/custom_editor.
Then we can minimize merge conflicts and the like when working on ds/custom_editor and ds/ipywidgets & master.

Once master has been updated with ds/custom_editor, i will revert this PR in ds/custom_editor

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@DonJayamanne DonJayamanne added the no-changelog No news entry required label Mar 16, 2020
@DonJayamanne DonJayamanne merged commit 81a8d7d into microsoft:ds/custom_editor Mar 17, 2020
@DonJayamanne DonJayamanne deleted the disableVSCAPI branch March 17, 2020 00:20
DonJayamanne added a commit that referenced this pull request Mar 17, 2020
* master:
  Fix merge issue
  Move redux logging to a different file (#10605)
  Disable custom editor API (#10604)
  Ensure local host only if connection not available (#10600)
  Delegate management of notebooks (creation and disposing) to I… (#10568)
  Refactor to accommodate upstream VSCode API changes (#10569)
  Use a single notebook beetween multiple native editors (#10514)
  Add support for synchronising edits between two nb editors of… (#10189)
  Fix tests in ds/custom_editor branch (#10512)
  Fix linter
  Reimplement custom editor using new API
@lock lock bot locked as resolved and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

no-changelog No news entry required

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants