Skip to content
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

Jump to bottom

Swagger annotation for shortLinkByKey #6682

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Swagger annotation for shortLinkByKey #6682

merged 1 commit into from
Dec 6, 2022

Conversation

fm3
Copy link
Member

@fm3 fm3 commented Dec 6, 2022

  • Ready for review

@fm3 fm3 added the backend label Dec 6, 2022
@fm3 fm3 requested a review from jstriebel December 6, 2022 14:10
@fm3 fm3 self-assigned this Dec 6, 2022
jstriebel
jstriebel approved these changes Dec 6, 2022
View reviewed changes
Copy link
Contributor

@jstriebel jstriebel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 👍

@fm3 fm3 enabled auto-merge (squash) December 6, 2022 14:12
@fm3 fm3 merged commit afe612a into master Dec 6, 2022
@fm3 fm3 deleted the shortlinks-swagger branch December 6, 2022 14:25
hotzenklotz added a commit that referenced this pull request Dec 12, 2022
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into pri…
4805fbe 
…cing

* 'master' of github.com:scalableminds/webknossos:
  fixes infinite loop in getLineCount (#6689)
  Catch Malformed Json Exceptions (#6691)
  Implement folder-specific search for datasets (#6677)
  Fix s3fs region access, s3 url styles (#6679)
  Swagger annotation for shortLinkByKey (#6682)
  Improve layout of dashboard
  Provide valid JSON schema (#6642)
philippotto added a commit that referenced this pull request Dec 13, 2022
@dependabot @philippotto
@frcroth @fm3 @erjel
Bump qs from 6.5.2 to 6.5.3 (#6684)
399078e 
* Add second (non-admin) default user to "initial data" trigger (#6666)

* add second (non-admin) user to initial data trigger

* rename second user and DRY insertion method

* format

* name default organization team "Default" when inserting initial data (analoguous to general organization creation)

* Add OIDC authentication (#6534)

Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>

* Guard against invalid-mag bucket volume save actions (#6660)

* [WIP] guard against invalid-mag bucket volume save actions

* avoid unnecessary creation of objects in ResolutionInfo instances

* use layer's resolution info when in wkstore adapter

* rename bucketPositionToGlobalAddress to bucketPositionToGlobalAddressOld

* get rid of bucketPositionToGlobalAddressOld

* rename bucketPositionToGlobalAddressNew to bucketPositionToGlobalAddress

* simplify getBucketExtent signature

* fix tests

* fix quick-select tool for scenarios where the color layer is available in the current mag but the volume layer isn't

* Update frontend/javascripts/test/model/binary/layers/wkstore_adapter.spec.ts

* avoid losing error chain during conversion

Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>

* Provide valid JSON schema (#6642)

extra `{}` cause JSON decode error in python standard JSON library and webknossos instance

Co-authored-by: Philipp Otto <[email protected]>

* Improve layout of dashboard

* Swagger annotation for shortLinkByKey (#6682)

* Bump qs from 6.5.2 to 6.5.3

Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: frcroth <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Florian M <[email protected]>
Co-authored-by: Philipp Otto <[email protected]>
Co-authored-by: erjel <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jstriebel jstriebel jstriebel approved these changes

@normanrz normanrz normanrz approved these changes

Assignees

@fm3 fm3

Labels
backend
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fm3 @normanrz @jstriebel