Skip to content

Use upstream server #4414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Nov 10, 2021
Merged

Use upstream server #4414

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3c10163
Flesh out fixes to align with upstream.
GirlBossRush Oct 28, 2021
0e7eb7e
Update route handlers to better reflect fallback behavior.
GirlBossRush Oct 29, 2021
ad787bb
Bump vendor.
GirlBossRush Oct 29, 2021
19c9c23
Touch up build, tests.
GirlBossRush Oct 29, 2021
062ce32
bump vscode.
GirlBossRush Nov 4, 2021
2481711
Add platform to vscode-reh-web task
code-asher Nov 4, 2021
dde9a08
Fix issue where workspace args are not parsed.
GirlBossRush Nov 4, 2021
26733fd
Update CLI test.
GirlBossRush Nov 4, 2021
059893f
Update CLI tests.
GirlBossRush Nov 4, 2021
9945428
Fix issues surrounding opening files within code-server's terminal.
GirlBossRush Nov 4, 2021
93adec7
Bump vendor.
GirlBossRush Nov 4, 2021
28e0d78
Update VS Code
code-asher Nov 5, 2021
4cf13f4
Merge remote-tracking branch 'origin/main' into upstream-server-fixes
code-asher Nov 5, 2021
76e6ccc
Readd parent wrapper for hot reload.
GirlBossRush Nov 5, 2021
efada23
Allow more errors.
GirlBossRush Nov 5, 2021
1f7e8a1
Bump vscode.
GirlBossRush Nov 5, 2021
914aad2
Fix issues surrounding Coder link.
GirlBossRush Nov 5, 2021
a413abf
Add dir creation and fix cli
code-asher Nov 5, 2021
55d878e
Remove hardcoded VSCODE_DEV=1
code-asher Nov 8, 2021
d03c9f5
Fix mismatching commit between client and server
code-asher Nov 8, 2021
8244463
Mostly restore command-line parity
code-asher Nov 8, 2021
d5ed30f
Fix static endpoint not emitting 404s
code-asher Nov 8, 2021
30b9923
Update VS Code
code-asher Nov 8, 2021
a281ccd
Import missing logError
code-asher Nov 9, 2021
7d48b82
Fix 403 errors
code-asher Nov 9, 2021
fc94ac9
Add code-server version to about dialog
code-asher Nov 9, 2021
89cc5a9
Use user settings to disable welcome page
code-asher Nov 10, 2021
e022788
Update VS Code cache step with new build directories
code-asher Nov 10, 2021
c8f2b12
Merge branch 'main' into upstream-server-fixes
code-asher Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump vscode.
  • Loading branch information
@GirlBossRush
GirlBossRush committed Nov 5, 2021
commit 1f7e8a1ec75c91094584f91160f5803ee350db44
2 changes: 1 addition & 1 deletion vendor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"postinstall": "./postinstall.sh"
},
"devDependencies": {
"code-oss-dev": "cdr/vscode#b93785c1438bc6e92f38c0842386afd8666c73f0"
"code-oss-dev": "cdr/vscode#f8de7134f6fdb8bb125b40a0ccae5a173d700056"
}
}
4 changes: 2 additions & 2 deletions vendor/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ clone-response@^1.0.2:
dependencies:
mimic-response "^1.0.0"

code-oss-dev@cdr/vscode#b93785c1438bc6e92f38c0842386afd8666c73f0:
code-oss-dev@cdr/vscode#f8de7134f6fdb8bb125b40a0ccae5a173d700056:
version "1.61.1"
resolved "https://codeload.github.com/cdr/vscode/tar.gz/b93785c1438bc6e92f38c0842386afd8666c73f0"
resolved "https://codeload.github.com/cdr/vscode/tar.gz/f8de7134f6fdb8bb125b40a0ccae5a173d700056"
dependencies:
"@microsoft/applicationinsights-web" "^2.6.4"
"@vscode/sqlite3" "4.0.12"
Expand Down