[ENG-5028] Squash all commits for project feature branch #10743
Merged
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
[ENG-5829] Add InstitutionalAffiltation mixin to Preprints
…enterForOpenScience/osf.io into preprint-institutions-list-api * 'feature/preprints-affiliations' of https://github.com/CenterForOpenScience/osf.io: make code review fixes add tests and extra validation fix save param add PreprintAffilatation model based code and add update_institutional_affiliation
…t-api [ENG-5844] Add preprint institution affiliation endpoint
…enterForOpenScience/osf.io into preprint-insetitutions-relationship-list-api * 'feature/preprints-affiliations' of https://github.com/CenterForOpenScience/osf.io: remove literal string permissions add docstring to explain permission improve preprint tests by creating 404 case improve permissions by dropping unsafe method behavior remove vestigial serializer # Conflicts: # api/preprints/permissions.py # api/preprints/serializers.py # api/preprints/views.py # api_tests/preprints/views/test_preprint_institutions.py
…lationship-list-api [ENG-5845] Preprint Institutions Relationship
into feature/preprints-affiliations * 'develop' of https://github.com/CenterForOpenScience/osf.io: Update CHANGELOG, bump version [CR][ENG-5681] Great Big Python Upgrade (#10648) # Conflicts: # api/nodes/serializers.py # osf/models/mixins.py
…tions [ENG-5979] Update preprint affilations to develop
…enterForOpenScience/osf.io into add-affilations-to-preprint-list * 'feature/preprints-affiliations' of https://github.com/CenterForOpenScience/osf.io:
…nt-list [ENG-5846][ENG-5847] Add affiliated_institutions to preprint list and detail endpoint
into feature/preprints-affiliations * 'develop' of https://github.com/CenterForOpenScience/osf.io: update dataverse dep revision to get changes
…enterForOpenScience/osf.io into feature/preprints-affiliations * 'feature/preprints-affiliations' of https://github.com/CenterForOpenScience/osf.io:
into feature/preprints-affiliations * 'develop' of https://github.com/CenterForOpenScience/osf.io: use correct version of module for metrics update Dockerfile for recent lints remove deprecated version stanza from docker-composes update reqs to pull from github commit shas correct body location for api.ia POST requests
…tions [ENG-6067] Update feature/preprints-affiliations
…tutions Fix Self Link for Preprint Affiliated Institutions
…nt-focus [ENG-5908] Add Test Confirming Preprint Affiliated Iinstitution Data is Sent to SHARE
…s-affiliations-test-merge-issue-3-updated
…tributor (#10741) * reorganize tests to ensure contributor permissions visible * allow read permissions for non-public contributors * fix testing issues and clean-up permissions changes * fix up author assertion permissions to be admin only * change test file name * improve tests institution relationship add affiliation addition/removal * Sync diff between #10739 and #10687 * Fix flake8 * Fix WriteOrPublicForRelationshipInstitutions for nodes * Fix incorrect `.can_edit()` call for preprints --------- Co-authored-by: John Tordoff <[email protected]>
cslzchen
changed the title
cslzchen
merged commit dadfbae
into
feature/preprints-affiliations-from-clean-develop
17 checks passed
cslzchen
added a commit
that referenced
this pull request
Sep 16, 2024
[ENG-5829] Add Institutional Affiliation mix-in to Preprints #10649 [ENG-5844] Add preprint institution affiliation endpoint #10655 [ENG-5845] Preprint Institutions Relationship #10659 [ENG-5846][ENG-5847] Add affiliated_institutions to preprint list and detail endpoint #10684 [Bug-fix] Fix Self Link for Preprint Affiliated Institutions #10698 [ENG-5908] Add Test Confirming Preprint Affiliated Institution Data is Sent to SHARE #10700 [ENG-5966] 2.0.1 BE: Update permission to support edit as a WRITE contributor #10741
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.
No description provided.