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.

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

[ENG-5028] Squash all commits for project feature branch #10743

Commits on Jun 25, 2024

  1. add PreprintAffilatation model based code and add update_institutiona…

    …l_affiliation
    John Tordoff committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    636a474 View commit details
    Browse the repository at this point in the history
  2. add tests and extra validation fix save param

    John Tordoff committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9d3f9e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. make code review fixes

    John Tordoff committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b77d2df View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge pull request #10649 from Johnetordoff/preprint-instituional-models

    [ENG-5829] Add InstitutionalAffiltation mixin to Preprints
    cslzchen authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    d2816bf View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. add preprint institution affiliation endpoint

    John Tordoff committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    8cac56c View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/preprints-affiliations' of https://github.com/C…

    …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
    John Tordoff committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    c573f91 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. add preprint relationship list endpoint

    John Tordoff committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    3a7bbb0 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. remove vestigial serializer

    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    5ca9c6a View commit details
    Browse the repository at this point in the history
  2. improve permissions by dropping unsafe method behavior

    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    8ef31e8 View commit details
    Browse the repository at this point in the history
  3. improve preprint tests by creating 404 case

    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    f12e1a5 View commit details
    Browse the repository at this point in the history
  4. add docstring to explain permission

    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    7ef4e80 View commit details
    Browse the repository at this point in the history
  5. remove literal string permissions

    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    3dee31b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ce081ce View commit details
    Browse the repository at this point in the history
  7. move InstitutionRelated into institutions folder

    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    07bf405 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #10655 from Johnetordoff/preprint-institutions-lis…

    …t-api
    
    [ENG-5844] Add preprint institution affiliation endpoint
    cslzchen authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    ebea701 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'feature/preprints-affiliations' of https://github.com/C…

    …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
    John Tordoff committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    268d5c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Configuration menu
    Copy the full SHA
    164aa66 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. update for contract API

    John Tordoff committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    de7c33c View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. fix updating behavior and clean-up tests

    John Tordoff committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    8adc2df View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. CR nits

    John Tordoff committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ae26160 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. More CR fixes/improvements

    cslzchen committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c58427c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10659 from Johnetordoff/preprint-insetitutions-re…

    …lationship-list-api
    
    [ENG-5845] Preprint Institutions Relationship
    cslzchen authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    231b478 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d7c0511 View commit details
    Browse the repository at this point in the history
  4. Redo migrations

    cslzchen committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    2c6a20d View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io

     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
    John Tordoff committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    0befa48 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10683 from Johnetordoff/feature/preprints-affilia…

    …tions
    
    [ENG-5979] Update preprint affilations to develop
    Johnetordoff authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    96599ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0f21772 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge branch 'feature/preprints-affiliations' of https://github.com/C…

    …enterForOpenScience/osf.io into add-affilations-to-preprint-list
    
    * 'feature/preprints-affiliations' of https://github.com/CenterForOpenScience/osf.io:
    John Tordoff committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    329fc7e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10684 from Johnetordoff/add-affilations-to-prepri…

    …nt-list
    
     [ENG-5846][ENG-5847] Add affiliated_institutions to preprint list and detail endpoint
    Johnetordoff authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    bf4fea1 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io

     into feature/preprints-affiliations
    
    * 'develop' of https://github.com/CenterForOpenScience/osf.io:
      update dataverse dep revision to get changes
    John Tordoff committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    a2bc15a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c1f949d View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Merge branch 'feature/preprints-affiliations' of https://github.com/C…

    …enterForOpenScience/osf.io into feature/preprints-affiliations
    
    * 'feature/preprints-affiliations' of https://github.com/CenterForOpenScience/osf.io:
    John Tordoff committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    11f2f55 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Merge branch 'develop' 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
    John Tordoff committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    3579155 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10693 from Johnetordoff/feature/preprints-affilia…

    …tions
    
    [ENG-6067] Update feature/preprints-affiliations
    cslzchen authored Aug 1, 2024
    Configuration menu
    Copy the full SHA
    2965d17 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. fix self link

    John Tordoff committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    9b916bd View commit details
    Browse the repository at this point in the history
  2. add tests for self link

    John Tordoff committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    2e4e47d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #10698 from Johnetordoff/fix-self-link-on-pp-insti…

    …tutions
    
    Fix Self Link for Preprint Affiliated Institutions
    cslzchen authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    a362241 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. add test confirming preprint affiliated institution data is sent to S…

    …HARE
    John Tordoff committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    55d4b74 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Merge pull request #10700 from Johnetordoff/add-test-for-SHARE-prepri…

    …nt-focus
    
    [ENG-5908] Add Test Confirming Preprint Affiliated Iinstitution Data is Sent to SHARE
    cslzchen authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    33af3e7 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Merge remote-tracking branch 'upstream/develop' into feature/preprint…

    …s-affiliations-test-merge-issue-3-updated
    cslzchen committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    6e8bdff View commit details
    Browse the repository at this point in the history
  2. [ENG-5966] 2.0.1 BE: Update permission to support edit as a WRITE con…

    …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 and Johnetordoff authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    2e0531f View commit details
    Browse the repository at this point in the history