aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-04Added @jmagnusson. Thanks!Tom Christie
2012-11-03Merge pull request #360 from jmagnusson/masterTom Christie
Tests for pull #358 "Return dictionaries as is"
2012-11-03Added test for ModelSerializer Meta fieldsJacob Magnusson
returning as expected
2012-11-03Added test that makes sure that fields withJacob Magnusson
dictionaries as data are returned as expected and not turned into string representations
2012-11-03Bye bye star importJacob Magnusson
2012-11-02Update release notesTom Christie
2012-11-02Merge pull request #359 from tomchristie/relationship_testsTom Christie
Relationship tests
2012-11-02Merge pull request #358 from jmagnusson/masterTom Christie
Return dictionaries as is
2012-11-02TweaksTom Christie
2012-11-02foreign key testsTom Christie
2012-11-02Apply to_native on dictionary keys as wellJacob Magnusson
2012-11-02Don't convert dictionary into a string representationJacob Magnusson
2012-11-02Initial PK relationship testsTom Christie
2012-11-02Fix issues with pk related fields in the browsable API.2.0.2Tom Christie
2012-11-01Remove accidental egg-info filesTom Christie
2012-11-01gitignore *.egg-infoTom Christie
2012-11-01Tweaks fields docs, and fix 2.0.1 version.2.0.1Tom Christie
2012-11-01Update release notesTom Christie
2012-11-01Merge pull request #357 from tomchristie/browseable-api-relationshipsTom Christie
Relational field support in browseable API.
2012-11-01Merge masterTom Christie
2012-11-01Relational field support in browseable API.Tom Christie
Add slug relational fields. Add quickstart.
2012-11-01Revert "Add django-filter (and django) requirement to setup.py."Ben Konrath
This reverts commit 5b399a844bfd07e94084bff84bbd9f98dbfef139. This has been reverted because it's not working properly.
2012-11-01Add django-filter (and django) requirement to setup.py.Ben Konrath
2012-11-01Add django-filter to tox.ini.Ben Konrath
2012-11-01Use requirements.txt in Travis 'install'.Ben Konrath
2012-11-01Change django-filter requirement to upstream version.Ben Konrath
This git revision has the django 1.3 compatibility pull request.
2012-11-01Added @ottoyiu. Thanks!Tom Christie
2012-11-01Merge pull request #351 from asfaltboy/fix_trans_choicesTom Christie
Return choices as unicode and not string
2012-11-01Merge pull request #352 from asfaltboy/cleanup_MultipleObjectBaseViewTom Christie
cleanup MultipleObjectBaseView remains
2012-11-01Merge branch 'master' into restframework2-filterBen Konrath
2012-11-01since MultipleObjectBaseView was renamed MultipleObjectAPIView, it stands to ↵Pavel Savchenko
reason to complete the renaming in docs and comments as well.
2012-11-01return choices as unicode and not string,Pavel Savchenko
might as well have jsonp return unicode
2012-11-01Merge pull request #349 from ZestCore/masterTom Christie
Documentation Fix for Auth/Throttling API guide + 'from_native' bug
2012-10-31fix 'from_native' method when rel is NoneOtto Yiu
'NoneType' object has no attribute 'to'
2012-10-31Fixing documentation on auth/throttling guidesOtto Yiu
2012-10-31PUT as create should return 201. Fixes #340.Tom Christie
2012-10-31added support for custom slug field and kwargsStephan Groß
without subclassing HyperlinkedRelatedField and overwriting slug_url_kwarg and slug_field there is no possibility to use other fields / arguments. now you can do something like this: url(r'^users/(?P<username>\w[\w-]*)$', UserInstance.as_view(), name='user-detail') class ProjectSerializer(serializers.HyperlinkedModelSerializer): created_by = serializers.HyperlinkedRelatedField(view_name='user-detail', slug_url_kwargs='username', slug_field='username')
2012-10-31Merge pull request #345 from minddust/masterTom Christie
minor docs fix
2012-10-31fixed typoStephan Groß
2012-10-31Merge pull request #344 from minddust/masterTom Christie
minor docs fix
2012-10-31added missing semicolonStephan Groß
2012-10-31Added @asfaltboy. Thanks!Tom Christie
2012-10-31Merge pull request #343 from asfaltboy/fix-docsTom Christie
Fixing tutorials
2012-10-31using 'pk' in fields throws KeyErrorPavel Savchenko
add missing imports Browsable API seems to be working fine with FBV's (2.0.0) removing snippets from the URI doesn't make sense remain consistent in using SnippetDetail
2012-10-30Package and doc tweaksTom Christie
2012-10-30Docs to django-rest-framework.orgTom Christie
2012-10-30Update travis image to masterTom Christie
2012-10-30Merge branch 'restframework2' into rest-framework-2-merge2.0.0Tom Christie
Conflicts: .gitignore .travis.yml AUTHORS README.rst djangorestframework/mixins.py djangorestframework/renderers.py djangorestframework/resources.py djangorestframework/serializer.py djangorestframework/templates/djangorestframework/base.html djangorestframework/templates/djangorestframework/login.html djangorestframework/templatetags/add_query_param.py djangorestframework/tests/accept.py djangorestframework/tests/authentication.py djangorestframework/tests/content.py djangorestframework/tests/reverse.py djangorestframework/tests/serializer.py djangorestframework/views.py docs/examples.rst docs/examples/blogpost.rst docs/examples/modelviews.rst docs/examples/objectstore.rst docs/examples/permissions.rst docs/examples/pygments.rst docs/examples/views.rst docs/howto/alternativeframeworks.rst docs/howto/mixin.rst docs/howto/reverse.rst docs/howto/usingurllib2.rst docs/index.rst docs/topics/release-notes.md examples/sandbox/views.py rest_framework/__init__.py rest_framework/compat.py rest_framework/utils/breadcrumbs.py setup.py
2012-10-30Make docs ready to push to django-rest-framework.orgTom Christie
2012-10-30Merge pull request #341 from minddust/restframework2Tom Christie
fix ModelSerializer useage