Merge remote-tracking branch 'upstream/develop' into feature/osf4i-in-progress-sso

cslzchen · cslzchen · commit 91b2d0049716 · 2026-04-20T15:21:58.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,16 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.8.2 (2026-04-20)
+===================
+
+* Hotfix to add alias for ip addresses, again
+
+26.8.1 (2026-04-20)
+===================
+
+* Hotfix to add alias for ip addresses
+
 26.8.0 (2026-04-16)
 ===================
 
diff --git a/angular.json b/angular.json
@@ -69,7 +69,7 @@
               "entry": "src/server.ts"
             },
             "security": {
-              "allowedHosts": ["localhost", "127.0.0.1"]
+              "allowedHosts": ["localhost", "127.0.0.1", "10.*", "*.osf.io"]
             }
           },
           "configurations": {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "osf",
-  "version": "26.8.0",
+  "version": "26.8.2",
   "scripts": {
     "ng": "ng",
     "analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`"entry": "src/server.ts"`
`70`	`70`	`},`
`71`	`71`	`"security": {`
`72`		`- "allowedHosts": ["localhost", "127.0.0.1"]`
	`72`	`+ "allowedHosts": ["localhost", "127.0.0.1", "10.", ".osf.io"]`
`73`	`73`	`}`
`74`	`74`	`},`
`75`	`75`	`"configurations": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "osf",`
`3`		`- "version": "26.8.0",`
	`3`	`+ "version": "26.8.2",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"ng": "ng",`
`6`	`6`	`"analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/*/.js --no-border-checks",`