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: manosim/django-rest-framework-docs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: PerfectPitchTech/django-rest-framework-docs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 16 files changed
  • 4 contributors

Commits on Aug 24, 2016

  1. Enhance api_endpoint model to track the tree structure of an api, and… 

    … add router settings for a better integration of viewsets.
    @dimitri-justeau
    dimitri-justeau committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    a4267e7 View commit details
    Browse the repository at this point in the history

  2. Add viewsets in demo project

    @dimitri-justeau
    dimitri-justeau committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    4470670 View commit details
    Browse the repository at this point in the history

  3. Fix case when RegexURLPattern has no parent

    @dimitri-justeau
    dimitri-justeau committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    f33aa98 View commit details
    Browse the repository at this point in the history

  4. Document new router settings

    @dimitri-justeau
    dimitri-justeau committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    ab5e821 View commit details
    Browse the repository at this point in the history

  5. Update README.md

    @dimitri-justeau
    dimitri-justeau committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    77dc489 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2016

  1. Merge branch 'master' into master

    @dimitri-justeau
    dimitri-justeau authored Aug 25, 2016
    Configuration menu
    Copy the full SHA
    e90aa70 View commit details
    Browse the repository at this point in the history

  2. Fix empty doctstring for viewsets when docstring is only defined at c… 

    …lass-level
    @dimitri-justeau
    dimitri-justeau committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    7a56175 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:dimitri-justeau/django-rest-frame… 

    …work-docs
    @dimitri-justeau
    dimitri-justeau committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    6bd92d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2016

  1. Adding in MarkDown support. Original contributed here #127

    Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    82ad711 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from PerfectPitchTech/master_md 

    Adding in MarkDown support. Original contributed here https://github.…
    @jared-mackey
    jared-mackey authored Sep 19, 2016
    Configuration menu
    Copy the full SHA
    53bc450 View commit details
    Browse the repository at this point in the history

  3. updated gitignore for pycharm

    Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    0ebc886 View commit details
    Browse the repository at this point in the history

  4. Update docs

    @manosim
    manosim authored and Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    19f4993 View commit details
    Browse the repository at this point in the history

  5. Minor Changes

    @manosim
    manosim authored and Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    0f8f4b9 View commit details
    Browse the repository at this point in the history

  6. Adding in MarkDown support. Original contributed here #127

    Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    6b403a8 View commit details
    Browse the repository at this point in the history

  7. updated gitignore for pycharm

    Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    5c91f22 View commit details
    Browse the repository at this point in the history

  8. Allow json header. Originally contributed at 089f754

    Jared Mackey committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    2315399 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from PerfectPitchTech/master_bug_fixes 

    Bug fixes from PR on original fork.
    @jared-mackey
    jared-mackey authored Sep 19, 2016
    Configuration menu
    Copy the full SHA
    110ddd9 View commit details
    Browse the repository at this point in the history
Loading