Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,695 Commits 3,682 Branches 359 Tags
75aba9d98e4d017cbb4e5dac75b7768737777fb4
Commit Graph

7506 Commits

Author SHA1 Message Date
Sandeep Somavarapu
75aba9d98e #102581 Rename the view to merges 2020-07-22 09:34:43 +02:00
Sandeep Somavarapu
973f12a4bf contribute configuraiton defaults through workbench web api 2020-07-21 17:42:38 +02:00
Rob Lourens
8dff81ed55 Add extra rg logging for #100373 2020-07-21 07:43:58 -07:00
Benjamin Pasero
02e0d23090 VS Code refuses to save a files with extensions it doesn't like (fix #102713) 2020-07-21 16:22:36 +02:00
Sandeep Somavarapu
b8405ce0b8 Fix #103005 2020-07-21 13:55:01 +02:00
Alex Dima
9749ceef5e Fixes #102336 2020-07-21 11:48:35 +02:00
Robo
3d0d50caf8 chore: update to electron 9-x-y (#102011) 
* chore: bump electron@9.0.5

* remove exploration config

* fix compile error

* fix compile error

* crashReporter has to be called only once before app ready

* chore: bump electron@9.1.0

* enable LayoutNG

* fix cron schedule

* allow disabling appcenter crash reporting

* set additional crash reporting parameters

* start crashreporter for child process on linux

* setup crash parameters only once

* remove unused crashReporter.guid

* address review feedback

* reuse argv.json for storing crash reporter id

* remove trailing commas

* update localized name

* update argv based on telemetry optout

* update initial config based on setting

* fix conditional errors

* remove telemetry.enableCrashReporter

* move default crash reporter config to electron-main

* update comment for ext host crash reporting

* set default value for configuration

* some 💄 changes

* address review feedback

* do not use ES7 features in JS yet

* add app.focus({ steal: true }) usage

Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
 2020-07-21 09:39:34 +02:00
Sandeep Somavarapu
4d21831e50 Fix #99764 2020-07-20 12:40:32 +02:00
Benjamin Pasero
2bbcd06114 debt - move supported encodings closer to where they belong 2020-07-20 10:40:47 +02:00
Sandeep Somavarapu
040b60f4d1 #102581 rename reset to clear with ... 2020-07-20 10:28:44 +02:00
Sandeep Somavarapu
881e7e546b #102581 improve first time sync dialog 2020-07-18 09:51:12 +02:00
Sandeep Somavarapu
c102db4cc8 💄 2020-07-17 12:44:26 +02:00
João Moreno
0b9cffd98a oops 2020-07-17 11:27:02 +02:00
Sandeep Somavarapu
a24b362980 💄 2020-07-17 10:49:42 +02:00
Martin Aeschlimann
97940b39db defaultUserWebExtensions setting 2020-07-17 10:03:49 +02:00
Benjamin Pasero
bb7910d481 fix #102627 2020-07-17 10:00:28 +02:00
Sandeep Somavarapu
fdf70cbc7b #100346 fix opening diffs and accept preview 2020-07-16 18:02:00 +02:00
Sandeep Somavarapu
a786284f7d #100346 change the order of dialog options 2020-07-16 14:01:46 +02:00
Sandeep Somavarapu
1f3a4f124f #100346 UI changes 
- introduce sync and cancel buttons
- ability to discard
- update entries on state change with decorations
 2020-07-16 13:11:37 +02:00
Sandeep Somavarapu
df336bbe62 #100346 support discard 2020-07-16 13:11:37 +02:00
Sandeep Somavarapu
9e457a6ca3 #100346 introduce merge state on a resource. Do not apply automatically. 2020-07-16 13:11:37 +02:00
Benjamin Pasero
69fd7afc56 throttle save participants in certain cases (#102542) 2020-07-16 10:50:57 +02:00
João Moreno
8e00e24e2b activityService.showViewActivity 2020-07-16 10:40:53 +02:00
Sandeep Somavarapu
92786be2c0 #100346 show view progress 2020-07-15 19:50:36 +02:00
Sandeep Somavarapu
3e2f28fc10 #100346 move manual sync view to separate file 2020-07-15 19:50:36 +02:00
Benjamin Pasero
d1d4e328d1 tests - reuse TestEncodingOracle 2020-07-15 08:32:46 +02:00
Benjamin Pasero
492b96a860 es6 - adopt more Array/String#includes over indexOf 2020-07-15 07:41:11 +02:00
Sandeep Somavarapu
670e4300e4 #100346 improve managing sync views. 
- enable only manual sync view and not all
 2020-07-14 22:04:42 +02:00
Sandeep Somavarapu
c338a51524 re order sync views 2020-07-14 22:04:42 +02:00
Sandeep Somavarapu
fd455c37d1 Fix #102001 2020-07-14 21:19:59 +02:00
Sandeep Somavarapu
9aadfc98db #100346 Introduce manual sync view 2020-07-14 13:33:14 +02:00
Johannes Rieken
2d27d4d079 use NotSupportedError for symbols that require the ability to launch processes, https://github.com/microsoft/vscode/issues/101857 2020-07-14 11:32:28 +02:00
Sandeep Somavarapu
40c9a33800 #100346 Prepare for manual sync 2020-07-14 10:12:42 +02:00
Sandeep Somavarapu
2e6dc523ef Fix #102082 2020-07-13 23:48:10 +02:00
acheronfail
3825520a45 fix: rename textFileEdiorModel to textFileEditorModel (#101849) 
* fix: rename textFileEdiorModel to textFileEditorModel

* fix: accumualted and valdiate typos
 2020-07-13 08:21:44 -07:00
Benjamin Pasero
a1e86dc02e encoding - disable test on windows 
Not sure why, looks like Windows and encodings are not intuitive.
 2020-07-13 15:25:06 +02:00
Benjamin Pasero
bbe787ac28 encoding - add test for #102202 2020-07-13 14:32:17 +02:00
Benjamin Pasero
372470a712 encoding 💄 2020-07-13 14:28:57 +02:00
Sandeep Somavarapu
414ac7a460 #100346 use manual sync task while turning on sync 2020-07-13 12:03:04 +02:00
Sandeep Somavarapu
343e4006bc #100346 inline SyncResourceConflicts type 2020-07-13 12:03:04 +02:00
Sandeep Somavarapu
04aa49cbbe #100346 merge single resource 2020-07-13 12:03:04 +02:00
Benjamin Pasero
fc8e4779d1 Use TextDecoder when decoding UTF-8 (#102369) 
* textfiles - always use TextDecoder when reading UTF-8

* fix tests

* do not share a text decoder when using streams

* jsdoc
 2020-07-13 11:45:01 +02:00
Sandeep Somavarapu
02fa61fece #100346 pass sync resoure while accepting content 2020-07-12 14:34:58 +02:00
Rob Lourens
3bb56cc884 Clean up usages of deprecated startsWith/endsWith helpers 2020-07-11 10:36:46 -07:00
Martin Aeschlimann
71c7660d20 Merge pull request #102100 from microsoft/aeschli/suggestFilename 
suggestFilename: use modeService instead of mime
 2020-07-11 17:36:02 +02:00
Benjamin Pasero
25673682f8 "Duplicate Workspace in New Window" just creates new window and opens workspace.json file (fixes #102148) 2020-07-11 17:07:52 +02:00
Rachel Macfarlane
40324ee577 Auth provider tweaks, change types of change events 2020-07-10 10:49:10 -07:00
Jackson Kearl
138e255728 Clean up multi root labels (#102051) 
* Change labels of URI's in multi-root workspaces to be
[RootName] • [Path From RootPaath to File]
rather than
[RootName] • [basename RootPath]/[Path From RootPath to File]
in cases where the root has an explicit name and
[RootName] • [Path From RootName to File]
in cases where the root's name is defaulted to basename

* Fixup cases where context added after path.
(073398241b)

* Remove unused

* Additional test case
 2020-07-10 10:44:17 -07:00
Sandeep Somavarapu
a25e2dbb56 #100346 introduce manual sync task 2020-07-10 19:04:48 +02:00
Alex Ross
f577e411dd Remove some uses of deprecated items from es6.code-search 2020-07-10 16:15:44 +02:00