Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
98,718 Commits 3,674 Branches 359 Tags
d29ab10eb6fcf1247d9d3e3123eb5e575ea2a6e1
Commit Graph

223 Commits

Author SHA1 Message Date
Sandeep Somavarapu
b63ccefbad #100315 rename to Settings Sync 2020-07-27 10:40:36 +02:00
Sandeep Somavarapu
8ca1cf6293 refactor sync to reflect preview, merge, accept & apply. 2020-07-26 22:15:23 +02:00
Sandeep Somavarapu
bf9cc76621 show merge dialog only when there are merges from another machine 2020-07-24 13:31:07 +02:00
Sandeep Somavarapu
8ef53a3f08 #103238 Initialize as soon as one of the account providers is available 2020-07-24 12:13:12 +02:00
Sandeep Somavarapu
75aba9d98e #102581 Rename the view to merges 2020-07-22 09:34:43 +02:00
Sandeep Somavarapu
b8405ce0b8 Fix #103005 2020-07-21 13:55:01 +02:00
Sandeep Somavarapu
4d21831e50 Fix #99764 2020-07-20 12:40:32 +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
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
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
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
Sandeep Somavarapu
40c9a33800 #100346 Prepare for manual sync 2020-07-14 10:12:42 +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
Sandeep Somavarapu
02fa61fece #100346 pass sync resoure while accepting content 2020-07-12 14:34:58 +02:00
Rachel Macfarlane
40324ee577 Auth provider tweaks, change types of change events 2020-07-10 10:49:10 -07:00
Sandeep Somavarapu
a25e2dbb56 #100346 introduce manual sync task 2020-07-10 19:04:48 +02:00
Sandeep Somavarapu
8dfdecb938 #100346 prepare for manual sync 2020-07-10 09:22:56 +02:00
Sandeep Somavarapu
793c1b28cb #100346 Use resource previews and remove conflict type 2020-07-09 12:37:44 +02:00
Sandeep Somavarapu
648e55967f #99664 do not use deprecated values util 2020-07-08 09:10:14 +02:00
Rachel Macfarlane
348e2b4c6e displayName -> label, use providerIds in favor of getProviderIds, #100993 2020-07-06 18:23:12 -07:00
Rachel Macfarlane
ab7a5ec3ad Address part of feedback for #100993 2020-07-06 08:51:24 -07:00
Sandeep Somavarapu
2c73c38a11 dispose always 2020-06-20 01:31:17 +02:00
Sandeep Somavarapu
2f6ef86931 Fix #100411 2020-06-20 01:25:55 +02:00
Sandeep Somavarapu
2da2634cc9 Remember current machine name 2020-06-17 15:03:55 +02:00
Sandeep Somavarapu
322bd6082d move auto sync logic from sync service to auto sync service 2020-06-17 15:03:55 +02:00
Sandeep Somavarapu
5ca3e09eb6 Fix #99102 2020-06-17 10:00:26 +02:00
Sandeep Somavarapu
5a986588b6 move sync enablement to auto sync service 2020-06-16 23:48:12 +02:00
Sandeep Somavarapu
7df4ebd0b3 Refactor auto sync service 2020-06-16 18:59:10 +02:00
Sandeep Somavarapu
8fe3a24489 set enablement on sync machines 2020-06-16 17:48:48 +02:00
Sandeep Somavarapu
d335d3639c Fix #99764 2020-06-10 21:02:30 +02:00
Sandeep Somavarapu
d50b795e6b Fix #95879 2020-06-09 13:27:34 +02:00
Sandeep Somavarapu
8f70ac449e #95879 Rename to IUserDataSyncAccountService 2020-06-09 13:27:34 +02:00
Matt Bierner
cadabab73f Mark _serviceBrand properties using declare (#99312) 
_serviceBrand is only used for typing and should not result in emit

Also adds readonly
 2020-06-05 11:04:15 -07:00
Sandeep Somavarapu
0bf375a847 fix #99274 2020-06-04 14:23:13 +02:00
Sandeep Somavarapu
ecafac21db Fix #99122 2020-06-03 13:46:36 +02:00
Rachel Macfarlane
ae684437a3 Do not show option to sign into GitHub when already signed in for preferences sync, fixes #97735 2020-06-01 10:25:21 -07:00
Sandeep Somavarapu
2db11562e3 fix #96370 2020-06-01 16:13:59 +02:00
Benjamin Pasero
c86de794a0 sandbox - move main process service into electron-sandbox 2020-05-25 13:57:24 +02:00
Benjamin Pasero
2c2750be08 sandbox - get rid of IMainProcessService2 2020-05-23 14:33:57 +02:00