Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cos-forks/django-rest-framework-json-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: cwisecarver/django-rest-framework-json-api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 27, 2015

  1. Issue django-json-api#155 - support serializers with custom primary keys

    @orf
    orf committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    d9e1196 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2016

  1. Fix included resources not being included on list

    @rpatterson
    rpatterson committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    77868fc View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. Fix included resources M2M type (TODO test)

    @rpatterson
    rpatterson committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    f0fa0e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Merge remote-tracking branch 'orf/alternate-pk' into develop

    @rpatterson
    rpatterson committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    10f818e View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. Issue django-json-api#155 Defer to lookup_field/custom id fields 

    TODO Test coverage

There are so many places where PK is assumed in
djangorestframework-jsonapi and so many places/ways to change IDs/URLs
in DRF itself, that getting coverage on all the edge cases will be quite
a lot of work.  Some of that work may be better spent re-factoring
things to make the code easier to understand and reduce the number of
edge cases in the first place.
    @rpatterson
    rpatterson committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    6334ceb View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2017

  1. PR django-json-api#307: Remove TODO comment

    @rpatterson
    rpatterson committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    c4513e7 View commit details
    Browse the repository at this point in the history

  2. PR django-json-api#307: Fix included_resources assumption

    @rpatterson
    rpatterson committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    a4e71d5 View commit details
    Browse the repository at this point in the history

  3. PR django-json-api#307: Fix redundant try/except

    @rpatterson
    rpatterson committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    ede0ad4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into alternate-pk

    @rpatterson
    rpatterson committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    d5b7a5c View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2017

  1. Resource Types: Add missing plural/format kwargs 

    Makes these utility functions much more re-usable
    @rpatterson
    rpatterson committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    b601765 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2017

  1. Merge pull request #1 from rpatterson/develop 

    Fix custom id field
    @cwisecarver
    cwisecarver authored May 30, 2017
    Configuration menu
    Copy the full SHA
    da700a7 View commit details
    Browse the repository at this point in the history
Loading