development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-31 10:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
38594 commits 1130 branches 299 tags 1.2 GiB
Commit graph

853 commits

Author SHA1 Message Date
Ramya Achutha Rao
1912c5d755 Allow extensions to log telemetry to log files #54001 2018-07-30 16:18:54 -07:00
Martin Aeschlimann
c640a0ed5c adopt color changes in colorizer tests 2018-07-27 11:02:03 +02:00
Isidor Nikolic
c1abdc1228
Merge pull request #54881 from Microsoft/misolori/a11y 
Fix color contrast issues
 2018-07-27 10:35:21 +02:00
Ramya Achutha Rao
9e411a5fd3 Renaming tag for settings for online services #54354 2018-07-26 17:21:32 -07:00
Miguel Solorio
e32ea43fcb
Merge branch 'master' into misolori/a11y 2018-07-26 10:25:15 -07:00
Ramya Rao
d8bf1443cf
Support tags on settings to filter in settings editor (#55094) 
* Support tags on settings to filter in settings editor

* Revert adding tags to api until we are ready
 2018-07-25 15:51:28 -07:00
Rachel Macfarlane
740d37d7dd Some setting descriptions cleanup, #54690 2018-07-25 11:02:07 -07:00
Jackson Kearl
f99a1e6505 Dots 2018-07-23 16:02:21 -07:00
Martin Aeschlimann
74c270e887 update grammars 2018-07-23 20:34:08 +02:00
Miguel Solorio
32cf6eb0fa
Merge branch 'master' into misolori/a11y 2018-07-23 09:38:00 -07:00
Miguel Solorio
3c37960bd8 Update color to meet color contrast ratiom, fixes #52580 2018-07-19 12:58:45 -07:00
Joao Moreno
bcdad4c79f fixes #53520 2018-07-18 11:12:06 +02:00
Greg Van Liew
c150d0d42d Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
Ramya Achutha Rao
f89c16c04c Standardize readme across built-in extensions #54098 2018-07-11 16:38:32 -07:00
Joao Moreno
044d192df0 remove bad timeout 2018-07-10 18:15:21 +02:00
Joao Moreno
6957a5c058 make git activation async 
fixes #50292
 2018-07-10 12:37:25 +02:00
Joao Moreno
19df280c7f fixes #53849 2018-07-09 10:37:51 +02:00
Joao Moreno
ee0a7a265d Merge branch 'master' of github.com:Microsoft/vscode 2018-07-09 10:15:59 +02:00
Joao Moreno
b18b795936 fixes #53668 2018-07-09 10:15:55 +02:00
Joao Moreno
1d831bdcf1 Merge remote-tracking branch 'origin/master' 2018-07-06 16:45:41 +02:00
Joao Moreno
b6781b0058 align lstree implementations 2018-07-06 16:45:03 +02:00
Joao Moreno
00a1abe912 cleanup git relative path calculation 2018-07-06 16:37:53 +02:00
Joao Moreno
3f9e71722d Merge commit 'refs/pull/49397/head' of github.com:Microsoft/vscode into pr/49397 2018-07-06 15:46:10 +02:00
João Moreno
d1f8ff6161
Merge pull request #52812 from Microsoft/joao/uri-handler 
Finalize UriHandler API
 2018-07-06 15:43:13 +02:00
Joao Moreno
ba98812272 💄 2018-07-06 15:31:43 +02:00
Joao Moreno
e4d42b6b9b Merge commit 'refs/pull/47578/head' of github.com:Microsoft/vscode into pr/47578 2018-07-06 15:23:18 +02:00
Joao Moreno
80766044f3 remove command from scm title 2018-07-06 15:22:21 +02:00
Joao Moreno
689c38f4aa 💄 2018-07-06 15:19:27 +02:00
Joao Moreno
4215f96251 Merge commit 'refs/pull/48020/head' of github.com:Microsoft/vscode into pr/48020 2018-07-06 15:10:34 +02:00
Joao Moreno
2b03845eef 💄 2018-07-06 15:09:41 +02:00
Joao Moreno
da1a35aabc Merge commit 'refs/pull/47890/head' of github.com:Microsoft/vscode into pr/47890 2018-07-06 15:07:20 +02:00
Joao Moreno
b5e8f88e3b use more resource level settings for git 2018-07-06 15:03:36 +02:00
Joao Moreno
50189ad617 Merge commit 'refs/pull/47819/head' of github.com:Microsoft/vscode into pr/47819 2018-07-06 14:54:42 +02:00
Joao Moreno
3a54676f50 move successful push notification into repository 2018-07-06 14:53:13 +02:00
Joao Moreno
ead170df00 Merge commit 'refs/pull/47790/head' of github.com:Microsoft/vscode into pr/47790 2018-07-06 14:48:10 +02:00
Joao Moreno
0b9ed72669 improve selection restoration 2018-07-06 14:45:44 +02:00
Joao Moreno
cb6d6aa512 Merge commit 'refs/pull/47238/head' of github.com:Microsoft/vscode into pr/47238 2018-07-06 14:41:52 +02:00
Joao Moreno
cc6d8aa00e Merge remote-tracking branch 'origin/master' into joao/uri-handler 2018-07-06 12:49:16 +02:00
Joao Moreno
f950abaa81 git: extract categorizeResourceByResolution 2018-07-06 12:34:38 +02:00
Joao Moreno
8f6c6e8bc0 Merge commit 'refs/pull/50252/head' of github.com:Microsoft/vscode into pr/50252 2018-07-06 12:26:22 +02:00
Joao Moreno
c0cfa06328 fix #44106 2018-07-06 12:20:56 +02:00
Joao Moreno
e045147e44 improve conflicts during git rebase flow 2018-07-06 12:15:27 +02:00
Dirk Baeumer
21991b4912 Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +02:00
Joao Moreno
92693a1b26 API: UriHandler, rename and docs 2018-06-25 15:13:03 +02:00
João Moreno
c3942c67b1
Merge pull request #52145 from NahomAgidew/master 
Remove inline git revert confirmation alert (Issue #43625)
 2018-06-18 10:54:49 +02:00
João Moreno
4e575be919
Merge pull request #49167 from chenhowa/git-errors 
Await git.pullFrom and gitt.pushTo to ensure any failures display an …
 2018-06-18 10:52:46 +02:00
João Moreno
4b1df4f4a7
Update statusbar.ts 2018-06-18 10:44:13 +02:00
Nahom Abi
080e8247cc Fix #51677: Git icon not spinning when pushing from command palette 2018-06-17 18:14:37 -07:00
Nahom Abi
04aba36883 Remove inline git revert confirmation alert (Issue #43625) 2018-06-15 15:36:33 -07:00
Joao Moreno
57aabf1c42 smoketest: more debug 2018-06-08 21:48:46 +02:00
Joao Moreno
b48174153e git: parenthesis 2018-06-08 21:24:58 +02:00
Joao Moreno
534060f381 smoketest: more debug 2018-06-08 21:24:15 +02:00
Joao Moreno
1ceb8d6d22 smoketest: more logging 2018-06-08 21:00:10 +02:00
Joao Moreno
c6b40b8f63 smoketest: add logging 2018-06-08 20:08:34 +02:00
João Moreno
4e26c330a8
Merge pull request #46066 from ddruker/ddruker/differentiate-foreground-color-git 
[GIT EXTENSION] Add Custom Foreground Color for Files Added to Index
 2018-06-04 17:21:14 +02:00
Joao Moreno
32d319c0dd 💄 2018-06-04 16:57:24 +02:00
Joao Moreno
495906f0cf Merge commit 'refs/pull/45254/head' of github.com:Microsoft/vscode into pr/45254 2018-06-04 16:50:58 +02:00
Joao Moreno
c693ba29c3 git: 💄 no_push feature 2018-06-04 16:48:47 +02:00
Joao Moreno
fb29dd0706 Merge commit 'refs/pull/45341/head' of github.com:Microsoft/vscode into pr/45341 2018-06-04 16:33:06 +02:00
Martin Aeschlimann
439ac990c3
Merge pull request #51026 from Hirse/master 
Add gitignore language
 2018-06-04 11:10:03 +02:00
Cherry Wang
749a1bfeee Markdown and common toolbar icons consistency pass (#50484) 
* arkdown and common toolbar icons consistency pass

* Fixed icon size related css

* fix merge issue

* flip
 2018-06-03 11:32:59 +02:00
Jan Pilzer
f3874f1bae
Add gitignore language 2018-06-02 19:28:58 -07:00
Joao Moreno
30317e97bd beware of keybinding command null arguments 
fixes #50821
 2018-06-01 14:11:54 +02:00
Joao Moreno
98601ceb2c careful with path comparisons on windows 
related to #50760
 2018-05-30 09:21:46 +02:00
Zhuowei Zhang
325a919569 git: Detect conflict markets in BOTH_ADDED files when staging 
The existing code only checked for conflict markers for files with BOTH_MODIFIED
status; files with BOTH_ADDED status were always detected as conflicting even after
conflicts are resolved.

This fixes #44106.
 2018-05-21 21:57:18 -04:00
Alex Ross
375411e631 Fixes #48714: Added conversion from local case of the file to git case. This does not fix the view in the Explorer, but this solution should be easy to apply to that issue too. 2018-05-07 11:37:17 -07:00
Joao Moreno
ee582714b6 git: cleanup ipc handles on deactivate 
related to #7758
 2018-05-03 09:12:05 +02:00
Howard Chen
a5f304f5f1 Await git.pullFrom and gitt.pushTo to ensure any failures display an error dialog to the user 2018-04-28 21:06:17 -07:00
Joao Moreno
02bcbbc8da pick different folder names for git clone 
fixes #48485
 2018-04-26 11:33:55 +02:00
Joao Moreno
d1380912cf use native dialog for git clone 
fixes #48492
 2018-04-26 11:33:16 +02:00
Joao Moreno
f765117b95 add workspace folder after git clone 
fixes #48738
 2018-04-26 11:20:06 +02:00
Joao Moreno
c2f0c40f25 use progress notification API for git clone 
fixes #48692
 2018-04-26 10:12:30 +02:00
Ramya Achutha Rao
1139de12c0 Create appInsights client only if user has opt-in to telemetry 2018-04-25 15:21:15 -07:00
Joao Moreno
5ded9d963a cleanup git clone error 
fixes #48486
 2018-04-25 19:31:05 +02:00
Joao Moreno
8b69e6db6b fixes #46854 2018-04-25 15:40:45 +02:00
Joao Moreno
7cf50421da fixes #48211 2018-04-25 09:04:41 +02:00
Peng Lyu
c69deaccd0 activate git by * 2018-04-23 17:58:54 -07:00
Joao Moreno
35f1c86f16 fix compile error 2018-04-23 16:30:17 +02:00
Joao Moreno
56ad4b3953 clone repo by url 2018-04-23 16:20:08 +02:00
Ramya Achutha Rao
0c47c04e85 Add missing yarn updates 2018-04-21 20:44:21 -07:00
Ramya Achutha Rao
953cdf7f3d Update vscode-extension-telemetry version 2018-04-20 10:30:05 -07:00
wbarajas@umich.edu
6c9265e2fd Merge branch 'master' of https://github.com/wmb0117/vscode 2018-04-16 22:36:36 -04:00
wbarajas@umich.edu
2c2122ee5d feature: add support to manually add repositories 2018-04-16 22:35:18 -04:00
Sandeep Somavarapu
e592885b49 Fix #46750 2018-04-16 17:10:46 +02:00
Adit Bhatt
59c06466c2 feat: add support for ignored repositories list 2018-04-14 22:55:23 -04:00
Pradeep Murugesan
f1a362b250 Commit always using sign off flag setting 47395 2018-04-13 11:28:35 +02:00
Ivor Huang
ee748ab5c8 implement push success notification for issue #39039 2018-04-12 20:48:31 -04:00
Ryuichi Inagaki
a02823851b ref #44776 Removed the test for deleteRef method 
* as we don't use stub in test
 2018-04-11 20:03:57 +10:00
Ryuichi Inagaki
6b7a644082 ref #44776 Only test the logic of parsing git show output 
* Instead of testing it through `getCommit` as we don't use stub in test
 2018-04-11 20:02:20 +10:00
Ryuichi Inagaki
278842c987 ref #44776 deleteRef instead of reset if commit has no parents 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki
81b3b44413 ref #44776 Added DeleteRef operation 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki
91414f62cf ref #44776 Introduced deleteRef method on git.Repository 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki
963d337689 ref #44776 Refactoring test 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki
ac63779dca ref #44776 Cater for the cases of multiple/no previous hashes 2018-04-10 21:01:55 +10:00
Ryuichi Inagaki
3fdf0bcc56 ref #44776 Get previous commits as part of commit info 2018-04-10 21:01:41 +10:00
Ryuichi Inagaki
d562ebbf25 ref #44776 Wrote a test for Repository#getCommit 2018-04-10 20:37:36 +10:00
Pradeep Murugesan
a8803b4543 #47041 fixed the scrolling of the editor and cursor after the revert from inline diff viewer 2018-04-05 15:15:02 +02:00
Florian Traber
67b3957473 #46860 make git delete popup modal 2018-04-01 09:39:41 +02:00
Joao Moreno
42c882151f only detect git encoding if files.autoGuessEncoding is enabled 
fixes #46826
 2018-03-28 12:52:10 +02:00
Joao Moreno
dafdde11c9 fixes #45911 2018-03-28 09:56:58 +02:00