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: django-json-api/django-rest-framework-json-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: knaperek/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
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 2, 2016

  1. initial fix for regular serializer relations

    Raymond Reggers committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    127f4b7 View commit details
    Browse the repository at this point in the history

  2. fixes to resolve correct resource_name

    Raymond Reggers committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    10c2633 View commit details
    Browse the repository at this point in the history

  3. prioritize serializer resource_name

    Raymond Reggers committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    735d67a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. minor fix to included serializers

    Raymond Reggers committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    54d0de8 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2016

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

    Conflicts:
	rest_framework_json_api/renderers.py
	rest_framework_json_api/utils.py
    @knaperek
    knaperek committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    d3bf13a View commit details
    Browse the repository at this point in the history
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy