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

Improvements for terms-of-services modal #6930

Merged
merged 5 commits into from
Mar 20, 2023
Merged

Improvements for terms-of-services modal #6930

merged 5 commits into from
Mar 20, 2023

Conversation

philippotto
Copy link
Member

@philippotto philippotto commented Mar 20, 2023 •
edited

  • don't allow to hit escape to close the modal when deadline has passed
  • provide orga-switcher when user is member of multiple orgas

image
image

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

I did the following:

  • set isDemoInstance=true and termsOfService.enabled=true
  • set up second organization (by creating a new user)
  • invite first user to new orga
  • switch between orgas with the new UI (don't accept TOS)
  • also check that escape doesnt close the modal

Issues:

(Please delete unneeded items, merge only when none are left open)

@philippotto philippotto self-assigned this Mar 20, 2023
@philippotto philippotto enabled auto-merge (squash) March 20, 2023 11:58
@philippotto philippotto merged commit b095dfb into master Mar 20, 2023
@philippotto philippotto deleted the tos-improvements branch March 20, 2023 12:15
hotzenklotz added a commit that referenced this pull request Mar 20, 2023
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into ema…
0424034 
…il-notification

* 'master' of github.com:scalableminds/webknossos:
  Prepare multi modality support (#6748)
  Improvements for terms-of-services modal (#6930)
  Fix creating task types with preferred mode (#6928)
hotzenklotz added a commit that referenced this pull request Mar 20, 2023
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into dro…
0879f2e 
…pdown-menu

* 'master' of github.com:scalableminds/webknossos:
  Fix download button for annotations when tiff export is disabled (#6931)
  Update PULL_REQUEST_TEMPLATE.md
  Prepare multi modality support (#6748)
  Improvements for terms-of-services modal (#6930)
  Fix creating task types with preferred mode (#6928)
  Fix styling for login pages for dark mode users (#6916)
  Added members to admin team page (#6915)
  Release 23.03.1 (#6917)
  Redesign Welcome UI (#6904)
  Fix race condition which could disable saving (#6914)
@fm3 fm3 mentioned this pull request Mar 21, 2023
Closed
hotzenklotz added a commit that referenced this pull request Mar 22, 2023
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into dra…
fc2477a 
…wings

* 'master' of github.com:scalableminds/webknossos:
  Update screenshots (#6934)
  Support rendering negative floats (#6895)
  Fix loading of webworkers in dev mode (#6933)
  Restore cache buster for webworkers (#6932)
  Introduce data vault as storage backend abstraction (#6899)
  Fix download button for annotations when tiff export is disabled (#6931)
  Update PULL_REQUEST_TEMPLATE.md
  Prepare multi modality support (#6748)
  Improvements for terms-of-services modal (#6930)
  Fix creating task types with preferred mode (#6928)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@normanrz normanrz normanrz approved these changes

Assignees

@philippotto philippotto

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@philippotto @normanrz