Code

Merge VS Code 1.21 source code#1067

Code

Merged

kburtram merged 28 commits intomastermicrosoft/azuredatastudio:masterfrom feature/merge121microsoft/azuredatastudio:feature/merge121Copy head branch name to clipboardApr 4, 2018

+140,996-98,554

Commits

Commits on Mar 30, 2018

• Initial VS Code 1.21 file copy with patches

  kburtram

  committed
  aab3fd5

• A few more merges

  kburtram

  committed
  728de5a

• Post npm install

  kburtram

  committed
  f0b7b86

• Fix batch of build breaks

  kburtram

  committed
  d394c59

• Fix more build breaks

  kburtram

  committed
  df3e792

Commits on Mar 31, 2018

• Fix more build errors

  kburtram

  committed
  d977448

Commits on Apr 2, 2018

• Fix more build breaks

  kburtram

  committed
  7ba59e0

• Runtime fixes 1

  kburtram

  committed
  b551971

• Get connection dialog working with some todos

  kburtram

  committed
  20065f6

Commits on Apr 3, 2018

• Fix a few packaging issues

  kburtram

  committed
  97229fe

• Copy several node_modules to package build to fix loader issues

  kburtram

  committed
  7dc49d9

• Merge branch 'master' into feature/merge121

  kburtram

  committed
  633447a

• Fix breaks from master

  kburtram

  committed
  a295582

Commits on Apr 4, 2018

• A few more fixes

  kburtram

  committed
  6e97968

• Make tests pass

  kburtram

  committed
  debd4c2

• First pass of license header updates

  kburtram

  committed
  e5063c3

• Second pass of license header updates

  kburtram

  committed
  7139639

• Fix restore dialog issues

  kburtram

  committed
  e19346a

• Merge master

  kburtram

  committed
  84b223e

• Merge branch 'master' into feature/merge121

  kburtram

  committed
  831cfc3

• Remove add additional themes menu items

  kburtram

  committed
  b9529c3

• Merge branch 'master' into feature/merge121

  kburtram

  committed
  67fc598

• fix select box issues where the list doesn't show up

  AbbiePetcht

  committed
  a829987

• formatting

  AbbiePetcht

  committed
  79a8a18

• Merge branch 'feature/merge121' of github.com:Microsoft/sqlopsstudio into feature/merge121

  AbbiePetcht

  committed
  92655f4

• Fix editor dispose issue

  kburtram

  committed
  66b8c57

• Merge branch 'feature/merge121' of https://github.com/Microsoft/sqlopsstudio into feature/merge121

  kburtram

  committed
  a534f37

• Copy over node modules to correct location on all platforms

  MattIrv

  committed
  12cd9dd