Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: fzunino/django-rest-framework
base: 8a2944acdf
...
head fork: fzunino/django-rest-framework
compare: 9ec50ac442
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jul 02, 2011
GitHub Merge Button Merge 3b81453 into 83b47c4
f54911f
@ulmus ulmus Set default renderers for views when yaml is not installed
Will use the renderer.DEFAULT_RENDERERS dict for determining available renderers in views.View to avoid a nonexistent renderer when yaml is not installed. Duplicates the behavior in parsers.DEFAULT_PARSERS
7ee1bbe
@ulmus ulmus gitignore
bcddc6f
@ulmus ulmus .gitignore
3900abd
@ulmus ulmus Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
…ramework

Conflicts:
	djangorestframework/views.py

Signed-off-by: Jens Alm <jens.alm@mac.com>
9baed0a
GitHub Merge Button Merge 20c7e60 into 1885012
f168ac9
GitHub Merge Button Merge 3e0a978 into 1885012
c042b43
Commits on Jul 04, 2011
@sebpiq sebpiq debugged serializers
3161475
GitHub Merge Button Merge 3161475 into 2dc042f
4887ac9
Commits on Jul 05, 2011
@tomchristie tomchristie Merge pull request #43 from sebpiq/master
Corrected bug in serializers
3b2e70d
Commits on Jul 06, 2011
@sebpiq sebpiq now cleans data from parameters used for overloads
e53c3cd
@sebpiq sebpiq fixed a bug in serializers
11ee385
GitHub Merge Button Merge 11ee385 into 3b2e70d
03a73cf
Commits on Jul 08, 2011
@jakul jakul add unit tests which show m2m creation failing for through table
6e6b35b
@jakul jakul update mixin to work with m2m data using a through field, by storing …
…the name of the field and manually creating an object in the related table
344db0d
@jakul jakul remove hardcoded model._meta.many_to_many[0]; update mixin tests to t…
…est with 0, 1, or multiple groups
91b9d0b
GitHub Merge Button Merge 8a2944a into 3b2e70d
f213ca0
GitHub Merge Button Merge 91b9d0b into 3b2e70d
3a4f394
Commits on Jul 11, 2011
@tomchristie tomchristie Merge pull request #45 from sebpiq/master
Clean overloads + fixed a bug in serializers
e4ce57b
GitHub Merge Button Merge 8a2944a into e4ce57b
7f0b291
@tomchristie tomchristie Merge pull request #44 from fzunino/m2m_create
Support for creating objects with m2m relations
5433cb3
GitHub Merge Button Merge 91b9d0b into 5433cb3
2b90906
@tomchristie tomchristie Merge pull request #46 from jakul/m2m_create_through
Update to existing pull request "Support for creating objects with m2m relationsM2m"
d1ed988
@tomchristie tomchristie Update Authors. Also It's going to be too hard to track who's done ex…
…actly what, so I'm just going to go with names for now...
247d242
@tomchristie tomchristie typo in test
4c590df
@tomchristie tomchristie Merge branch 'master' of github.com:tomchristie/django-rest-framework
f7a213b
tom christie tom@tomchristie.com hg-git merging
1135505
tom christie tom@tomchristie.com hg-git merging
d9fef5c
tom christie tom@tomchristie.com hg-git merging
5e6a869
tom christie tom@tomchristie.com hg-git merging
bab9200
tom christie tom@tomchristie.com hg-git merging
c70da25
tom christie tom@tomchristie.com hg-git merging
a2bc0bd
tom christie tom@tomchristie.com hg-git merging
a2a6bae
tom christie tom@tomchristie.com hg-git merging
e12a91c
tom christie tom@tomchristie.com hg-git merging
a42ec16
tom christie tom@tomchristie.com hg-git merging
9ec50ac
Something went wrong with that request. Please try again.