-
Notifications
You must be signed in to change notification settings - Fork 327
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.
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
Re-add permissions changes for files on withdrawn registrations #10671
Merged
jwalz
merged 1 commit into
CenterForOpenScience:feature/b-and-i-24-14
from
jwalz:unrevert_eng_3685
Jul 17, 2024
Merged
Re-add permissions changes for files on withdrawn registrations #10671
jwalz
merged 1 commit into
CenterForOpenScience:feature/b-and-i-24-14
from
jwalz:unrevert_eng_3685
Jul 17, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 34d5641.
55aa055
into
CenterForOpenScience:feature/b-and-i-24-14
6 checks passed
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 13, 2024
…penScience/osf.io into fix-source-tags * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # addons/boa/requirements.txt # addons/box/requirements.txt # addons/dataverse/requirements.txt # addons/dropbox/requirements.txt # addons/github/requirements.txt # addons/gitlab/requirements.txt # addons/mendeley/requirements.txt # addons/owncloud/requirements.txt # addons/s3/requirements.txt # addons/twofactor/requirements.txt # addons/wiki/requirements.txt # addons/zotero/requirements.txt # api/base/utils.py # api/users/serializers.py # api_tests/draft_registrations/views/test_draft_registration_list.py # api_tests/nodes/views/test_node_draft_registration_list.py # api_tests/users/views/test_user_draft_registration_list.py # api_tests/users/views/test_user_settings.py # docker-compose.yml # poetry.lock # pyproject.toml # requirements.txt # requirements/dev.txt # requirements/release.txt # tests/test_views.py # website/util/metrics.py
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 13, 2024
…penScience/osf.io into fix-source-tags * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # addons/boa/requirements.txt # addons/box/requirements.txt # addons/dataverse/requirements.txt # addons/dropbox/requirements.txt # addons/github/requirements.txt # addons/gitlab/requirements.txt # addons/mendeley/requirements.txt # addons/owncloud/requirements.txt # addons/s3/requirements.txt # addons/twofactor/requirements.txt # addons/wiki/requirements.txt # addons/zotero/requirements.txt # api/base/utils.py # api/users/serializers.py # api_tests/draft_registrations/views/test_draft_registration_list.py # api_tests/nodes/views/test_node_draft_registration_list.py # api_tests/users/views/test_user_draft_registration_list.py # api_tests/users/views/test_user_settings.py # docker-compose.yml # poetry.lock # pyproject.toml # requirements.txt # requirements/dev.txt # requirements/release.txt # tests/test_views.py # website/util/metrics.py
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 13, 2024
…penScience/osf.io into fix-source-tags * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # addons/boa/requirements.txt # addons/box/requirements.txt # addons/dataverse/requirements.txt # addons/dropbox/requirements.txt # addons/github/requirements.txt # addons/gitlab/requirements.txt # addons/mendeley/requirements.txt # addons/owncloud/requirements.txt # addons/s3/requirements.txt # addons/twofactor/requirements.txt # addons/wiki/requirements.txt # addons/zotero/requirements.txt # api/base/utils.py # api/users/serializers.py # api_tests/draft_registrations/views/test_draft_registration_list.py # api_tests/nodes/views/test_node_draft_registration_list.py # api_tests/users/views/test_user_draft_registration_list.py # api_tests/users/views/test_user_settings.py # docker-compose.yml # poetry.lock # pyproject.toml # requirements.txt # requirements/dev.txt # requirements/release.txt # tests/test_views.py # website/util/metrics.py
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 21, 2024
…penScience/osf.io into fix-preprint-emails * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: Make resubmissions more like submissions (CenterForOpenScience#10709) renamed files with travis in their names fixed case where it was more appropriate removed all travis mentions and replaced them with CI [ENG-2562] add system tags to users created via institutional sign up system (CenterForOpenScience#10696) refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # osf/utils/notifications.py # website/templates/emails/reviews_resubmission_confirmation.html.mako
Johnetordoff
pushed a commit
to Johnetordoff/osf.io
that referenced
this pull request
Aug 21, 2024
…penScience/osf.io into fix-preprint-emails * 'feature/b-and-i-24-14' of https://github.com/CenterForOpenScience/osf.io: Make resubmissions more like submissions (CenterForOpenScience#10709) renamed files with travis in their names fixed case where it was more appropriate removed all travis mentions and replaced them with CI [ENG-2562] add system tags to users created via institutional sign up system (CenterForOpenScience#10696) refactor handle_duplicate_notifications and add tests Shorten lines; rename script for test clarity fix flake8 errors add admin screen to manage duplicate notifications [ENG-2814] Allow Read-only and Read/Write contributors to view a project's draft registrations (CenterForOpenScience#10660) [CR][ENG-5997] merge develop into b-and-i branch (CenterForOpenScience#10691) add exception handling in case state doesn't change [ENG-4527] Fix citation to use registered date (CenterForOpenScience#10678) restrict state changes more and allow no-ops split apart change provider views from general preprint view and machine_state change viewa Re-add permissions changes for files on withdrawn registrations (CenterForOpenScience#10671) [ENG-4903] Fixes issue with email confirmation links failing due to database congestion (CenterForOpenScience#10662) # Conflicts: # osf/utils/notifications.py # website/templates/emails/reviews_resubmission_confirmation.html.mako
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 34d5641.
Purpose
Changes for ENG-3685 were reverted to avoid any complications with the Python Upgrade release. Re-add those changes to the b&i feature branch.
Changes
See #10650
QA Notes
Please make verification statements inspired by your code and what your code touches.
What are the areas of risk?
Any concerns/considerations/questions that development raised?
Documentation
Side Effects
Ticket