Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
90,679 Commits 3,644 Branches 358 Tags
3abcabd4e8a4929ae9f15cf05ae4e8a7dbaaec11
Commit Graph

1771 Commits

Author SHA1 Message Date
Joao Moreno
eaf1759f29 Merge commit 'refs/pull/53286/head' of github.com:Microsoft/vscode into pr/53286 2018-09-13 17:01:23 +02:00
Joao Moreno
4b2df59105 Merge branch 'pr/54300' 2018-09-13 16:07:41 +02:00
Joao Moreno
ca7ae00825 💄 2018-09-13 16:07:30 +02:00
Joao Moreno
9c06533ace Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300 2018-09-13 15:55:04 +02:00
Jason Bright
86230c239c Git rebase detection (#57651) 
* Test #57299 - script to stage test data.

* Fix #57299 - improve git rebase detection

* Revert "Test #57299 - script to stage test data."

This reverts commit 5f7142c25a.
 2018-09-13 15:47:05 +02:00
Joao Moreno
6c504e7ee3 💄 2018-09-13 15:35:58 +02:00
Joao Moreno
406f710b39 Merge commit 'refs/pull/50712/head' of github.com:Microsoft/vscode into pr/50712 2018-09-13 15:25:42 +02:00
João Moreno
d9e06518f1 Merge pull request #57374 from Protolane/enhancement/replace-brackets-too-upon-creating-new-branch 
#57373 Replace brackets as well upon creating a branch
 2018-09-13 14:35:54 +02:00
Miguel Solorio
7f41255769 Update list colors for our light theme to pass color contrast ratio 2018-09-12 16:06:01 -07:00
Joao Moreno
d880689924 git: fetch from all remotes 
fixes #56463
 2018-09-12 16:21:11 +02:00
Joao Moreno
a915b67582 introduce git.fetchOnPull 
related to #56463
 2018-09-12 16:15:35 +02:00
Joao Moreno
9b0eee12d3 💄 commit empty 2018-09-12 15:46:40 +02:00
Joao Moreno
e2b2b5bc9d Merge branch 'master', commit 'refs/pull/56048/head' of github.com:Microsoft/vscode into pr/56048 2018-09-12 15:37:41 +02:00
João Moreno
3f51b7fd11 Merge pull request #55975 from wistcc/WC/55915 
Fixing text when reverting changes for deleted file
 2018-09-12 15:31:34 +02:00
Joao Moreno
5455483afe fix missing resource 2018-09-12 14:56:39 +02:00
Joao Moreno
51e471a663 Merge remote-tracking branch 'origin/master' 2018-09-12 14:54:36 +02:00
Joao Moreno
b920ce8583 💄 2018-09-12 14:54:22 +02:00
Joao Moreno
f82fcb8a0b Merge commit 'refs/pull/55976/head' of github.com:Microsoft/vscode into pr/55976 2018-09-12 14:50:03 +02:00
João Moreno
15344fc6a4 Merge pull request #54897 from segevfiner/checkout-new-remote-branch 
Try to checkout a new local branch when checking out a remote branch
 2018-09-12 14:46:33 +02:00
João Moreno
24d9eeb9a8 Merge pull request #54867 from Hirico/master 
Preserve the revealed area after using "Open File" from git-diff editor (fix #53465)
 2018-09-12 12:22:06 +02:00
Joao Moreno
405e853713 💄 2018-09-12 12:03:08 +02:00
Joao Moreno
fa1deaaa34 Merge commit 'refs/pull/52527/head' of github.com:Microsoft/vscode into pr/52527 2018-09-12 12:01:51 +02:00
Joao Moreno
7ffa9219ae fixes #52037 2018-09-12 11:55:21 +02:00
Joao Moreno
07e7dac2e7 💄 2018-09-12 11:40:25 +02:00
Joao Moreno
f1ef0a7fbe Merge commit 'refs/pull/51111/head' of github.com:Microsoft/vscode into pr/51111 2018-09-12 11:30:29 +02:00
João Moreno
fcfe771403 Merge pull request #50526 from beauallison/correct-git-light-check-icon 
Align GIT light colored check icon with dark
 2018-09-11 16:05:31 +02:00
Joao Moreno
f92afbdc3c git: mergebase is a readonly operation 2018-09-11 11:46:02 +02:00
Ivan Sučić
f329e748b9 Fix#35905 2018-09-10 20:46:00 +02:00
Joao Moreno
dec5ac9811 missing git api call forwarding 2018-09-10 15:26:57 +02:00
nesukun
907a021f74 Add support for force push and force-with-lease 2018-09-08 23:40:07 +01:00
Git-Lior
8d147f35b7 fixed no user.email/user.name error message order 2018-09-08 22:57:10 +03:00
Git-Lior
63748f8088 no user.email/user.name error message now shows current values 2018-09-07 14:40:23 +03:00
Git-Lior
1f678697ec Fix #57222 - improve no user.email/user.name config error message 2018-09-07 12:13:28 +03:00
Alex Dima
c36258d23f Use const enums (to inline their values in JS) 2018-09-06 20:39:19 +02:00
Joao Moreno
ad58b37dc2 fixes #53520 2018-09-06 15:23:32 +02:00
Johannes Rieken
c2c5819fc8 adopt vscode-nls 4.0.0 2018-09-06 14:44:33 +02:00
Johannes Rieken
ccec2c9543 use vsce packagedDependencies 2018-09-04 12:29:23 +02:00
Johannes Rieken
f82bcb20ed webpack - move __dirname-config up into shared config 2018-09-03 12:38:46 +02:00
Morten Henriksen
d6b82a56e0 Merge remote-tracking branch 'Microsoft/master' into feature/50241-Add_branch_name_validation 
* Microsoft/master: (4802 commits)
  Fixes #57415: autoSurround - rename "always" to "languageDefined"
  debug: skip over %0
  explorer view: cut down delay time till progress from 3.2s to 1.2s
  file workspace suffix is empty string
  Revert "debug: do not send terminate to EH debugging"
  Fixes #57411: Rename `autoWrapping` to `autoSurround` to avoid confusions related to text wrapping
  Fixes #57453: Avoid thinking the user typed in the find input when setting the search string value
  Synchronisation notification: - Show extension being synchronised - Delete the downloaded extensions
  [html] fix tests
  debug: do not send terminate to EH debugging
  webpack - let build fail when webpack generates an error or a warning
  [html] update service. Fixes #57445
  node-debug@1.27.6
  more complete fix for #57483
  fix #57351
  fix #57483
  fixes #56015
  dispose of RunOnceScheduler properly
  Fixes Microsoft/monaco-editor#1021: Use ProviderResult in modes.ts
  fix #55607
  ...
 2018-08-29 17:58:36 +02:00
Joao Moreno
10e0a22f6d fixes #56015 2018-08-29 13:22:59 +02:00
Bruno Finger
48ef5107a0 #57373 Replace brackets as well upon creating a branch 2018-08-28 12:10:54 +02:00
Joao Moreno
200a7185a0 related to #57224 2018-08-27 16:57:29 +02:00
Johannes Rieken
b0f63ff69d Merge pull request #57155 from Microsoft/joh/ts-webpack 
Webpack for ts extension
 2018-08-24 17:00:11 +02:00
Johannes Rieken
cdb9c0a8f4 update vscode-nls-dev to fixed version, share more config between extensions 2018-08-24 16:37:10 +02:00
Johannes Rieken
6ba52f7b25 copy nls 2018-08-24 15:04:36 +02:00
Joao Moreno
6e909d4132 git: expose error codes in API 2018-08-24 12:24:37 +02:00
Joao Moreno
103715c3cc git: implement API 2018-08-24 12:04:29 +02:00
Joao Moreno
28d2b5d2d6 wip: git api 2018-08-24 11:19:05 +02:00
Joao Moreno
811a6be05b 💄 2018-08-24 11:16:49 +02:00
Joao Moreno
6d2598ad88 git api: repository state 2018-08-24 11:16:49 +02:00