Skip to content

Commit 37b599f

Browse files
committed
Merge remote-tracking branch 'origin/master' into sso-exclusive-all
2 parents 86c72cf + e869866 commit 37b599f

File tree

238 files changed

+28683
-11300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+28683
-11300
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,5 +154,5 @@ venv
154154

155155
# frontend/i18n files, which are created during build or updating the languages
156156
src/packages/frontend/i18n/extracted.json
157-
src/packages/frontend/i18n/*.compiled.json
157+
src/packages/frontend/i18n/trans/*.compiled.json
158158

src/compute/compute/dev/4-startup-script.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
# conf directory, based, e.g., on the on prem run script. The api_server can be
1010
# especially tricky to untangle when doing dev.
1111

12+
# NOTE: this doesn't work with the new openapi validation, so you have to do
13+
#
14+
# export COCALC_DISABLE_API_VALIDATION=yes
15+
#
16+
# before running your hub dev server to disable that.
17+
1218
set -v
1319

1420
export api_server=`cat conf/api_server`

src/compute/compute/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"awaiting": "^3.0.0",
4242
"cookie": "^0.5.0",
4343
"debug": "^4.3.2",
44-
"websocketfs": "^0.17.2",
44+
"websocketfs": "^0.17.3",
4545
"ws": "^8.18.0"
4646
},
4747
"homepage": "https://github.com/sagemathinc/cocalc/tree/master/src/packages/compute",

0 commit comments

Comments
 (0)