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

Merge #6176 to master #6258

Merged
merged 20 commits into from Oct 9, 2019
Merged

Merge #6176 to master #6258

merged 20 commits into from Oct 9, 2019

Commits on Sep 12, 2019

  1. Copy the full SHA
    27a30c1 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    1dc1899 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    f8e288f View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    2d8b2f1 View commit details
    Browse the repository at this point in the history
  5. Use correct lookup field on RelatedProjectQuerySetBase

    `self` is either ChildRelatedProjectQuerySet or
    ParentRelatedProjectQuerySet. None of these one has a `project`
    field. Because of this, we need to use `self.project_field` for lookup.
    humitos committed Sep 12, 2019
    Copy the full SHA
    0d42c1b View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    3b2871a View commit details
    Browse the repository at this point in the history
  7. Merge branch 'humitos/subproject-api-projectrelationship' of github.c…

    …om:readthedocs/readthedocs.org into humitos/subproject-api-projectrelationship
    humitos committed Sep 12, 2019
    Copy the full SHA
    197d106 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    85e6cb7 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2019

  1. Merge branch 'master' of github.com:readthedocs/readthedocs.org into …

    …humitos/subproject-api-projectrelationship
    humitos committed Oct 1, 2019
    Copy the full SHA
    d9bb87c View commit details
    Browse the repository at this point in the history
  2. More logic tests added for restrictions

    - Adding the project as subproject of itself
    - Nesting subprojects is not supported
    - Unique alias across subprojects of project
    humitos committed Oct 1, 2019
    Copy the full SHA
    a189f59 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    5d928f5 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'humitos/apiv3/project-update-endpoint' into humitos/sub…

    …project-api-projectrelationship
    humitos committed Oct 1, 2019
    Copy the full SHA
    cfad69b View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2019

  1. Merge branch 'humitos/apiv3/project-update-endpoint' of github.com:re…

    …adthedocs/readthedocs.org into humitos/subproject-api-projectrelationship
    humitos committed Oct 2, 2019
    Copy the full SHA
    5494d98 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    eb744c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. Update readthedocs/projects/querysets.py

    Co-Authored-By: Santos Gallegos <santos_g@outlook.com>
    humitos and stsewd committed Oct 4, 2019
    Copy the full SHA
    9c2d2bb View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a7d1db2 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    c355ada View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Merge pull request #6176 from readthedocs/humitos/subproject-api-proj…

    …ectrelationship
    
    Create subproject relationship via APIv3 endpoint
    humitos committed Oct 8, 2019
    Copy the full SHA
    193fec6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    3c40f49 View commit details
    Browse the repository at this point in the history
  3. Fix linter

    stsewd committed Oct 8, 2019
    Copy the full SHA
    eca2ce8 View commit details
    Browse the repository at this point in the history