Skip to content

Commit

Permalink
Merge branch 'master' into default-setting-for-non-public-datasets
Browse files Browse the repository at this point in the history
  • Loading branch information
rschwanhold authored Sep 24, 2018
2 parents 90147a9 + 5496c34 commit deeaf3d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).

### Fixed

-
- Fixed a bug which caused data to not be displayed correctly if adjacent data does not exist.[#3270](https://github.com/scalableminds/webknossos/pull/3270)

### Removed

Expand Down
3 changes: 2 additions & 1 deletion webknossos-datastore/app/DsRequestHandler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ class DsRequestHandler @Inject() (router: Router, errorHandler: HttpErrorHandler
"Access-Control-Allow-Origin" -> "*",
"Access-Control-Max-Age" -> "600",
"Access-Control-Allow-Methods" -> "POST, GET, DELETE, PUT, HEAD, PATCH, OPTIONS",
"Access-Control-Allow-Headers" -> request.headers.get("Access-Control-Request-Headers").getOrElse(""))
"Access-Control-Allow-Headers" -> request.headers.get("Access-Control-Request-Headers").getOrElse(""),
"Access-Control-Expose-Headers" -> "MISSING-BUCKETS")
})
} else {
super.routeRequest(request)
Expand Down

0 comments on commit deeaf3d

Please sign in to comment.