encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-23 10:03:57 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,343 Commits 18 Branches 132 Tags 105 MiB
584c111aab
Commit Graph

1343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
584c111aab Merge pull request #366 from jmagnusson/master 
Support for Djangos caching framework, fixes #346
 2012-11-05 01:48:19 -08:00
Jacob Magnusson
7df7dadccd Remove `request' from response instance while 
testing caching
 2012-11-04 13:42:29 +01:00
Jacob Magnusson
bd5a3ee7d5 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2012-11-04 12:52:11 +01:00
Jacob Magnusson
963c5fe4a7 Remove attributes that are not needed when caching 
the Response object. This fixes #346
 2012-11-04 12:48:41 +01:00
Jacob Magnusson
44f280c3ab Add tests for caching of GET/HEAD requests using 
Django's built in caching framework.
Currently fails as some attributes on the Response
object are not pickable
 2012-11-04 12:47:46 +01:00
Tom Christie
3e0319389a Added @jmagnusson. Thanks! 2012-11-04 09:45:30 +00:00
Tom Christie
746686b065 Merge pull request #360 from jmagnusson/master 
Tests for pull #358 "Return dictionaries as is"
 2012-11-03 00:31:36 -07:00
Jacob Magnusson
38af6107b5 Added test for ModelSerializer Meta fields 
returning as expected
 2012-11-03 00:32:08 +01:00
Jacob Magnusson
1b49615c00 Added test that makes sure that fields with 
dictionaries as data are returned as expected and
not turned into string representations
 2012-11-03 00:32:02 +01:00
Jacob Magnusson
19a218f859 Bye bye star import 2012-11-03 00:27:56 +01:00
Tom Christie
59c1e0933f Update release notes 2012-11-02 21:13:29 +00:00
Tom Christie
b468dd6271 Merge pull request #359 from tomchristie/relationship_tests 
Relationship tests
 2012-11-02 14:08:49 -07:00
Tom Christie
dafbbdc5bf Merge pull request #358 from jmagnusson/master 
Return dictionaries as is
 2012-11-02 14:08:21 -07:00
Tom Christie
8ec54e6a9f Tweaks 2012-11-02 20:56:51 +00:00
Tom Christie
6eaec7a0ec foreign key tests 2012-11-02 20:53:33 +00:00
Jacob Magnusson
a6806f0307 Apply to_native on dictionary keys as well 2012-11-02 21:48:16 +01:00
Jacob Magnusson
3de61d200c Don't convert dictionary into a string representation 2012-11-02 20:55:58 +01:00
Tom Christie
e84ce60a0d Initial PK relationship tests 2012-11-02 19:11:40 +00:00
Tom Christie
b9bff2a984 Fix issues with pk related fields in the browsable API. 2012-11-02 14:05:14 +00:00
Tom Christie
2dec2b9c13 Remove accidental egg-info files 2012-11-01 23:50:00 +00:00
Tom Christie
b8648c08be gitignore *.egg-info 2012-11-01 23:48:25 +00:00
Tom Christie
062f5caef3 Tweaks fields docs, and fix 2.0.1 version. 2012-11-01 23:40:34 +00:00
Tom Christie
09d70958bd Update release notes 2012-11-01 23:15:42 +00:00
Tom Christie
5209cd1dda Merge pull request #357 from tomchristie/browseable-api-relationships 
Relational field support in browseable API.
 2012-11-01 16:12:42 -07:00
Tom Christie
36e21153fb Merge master 2012-11-01 23:11:28 +00:00
Tom Christie
d327c5f531 Relational field support in browseable API. 
Add slug relational fields.
Add quickstart.
 2012-11-01 23:04:13 +00:00
Tom Christie
600289a815 Added @ottoyiu. Thanks! 2012-11-01 13:31:22 +00:00
Tom Christie
5558c0530f Merge pull request #351 from asfaltboy/fix_trans_choices 
Return choices as unicode and not string
 2012-11-01 06:27:28 -07:00
Tom Christie
aa779598aa Merge pull request #352 from asfaltboy/cleanup_MultipleObjectBaseView 
cleanup MultipleObjectBaseView remains
 2012-11-01 06:12:16 -07:00
Pavel Savchenko
9a0cc7c720 since MultipleObjectBaseView was renamed MultipleObjectAPIView, it stands to reason to complete the renaming in docs and comments as well. 2012-11-01 15:06:11 +02:00
Pavel Savchenko
d3aedd5fb1 return choices as unicode and not string, 
might as well have jsonp return unicode
 2012-11-01 15:00:22 +02:00
Tom Christie
204db7bdaa Merge pull request #349 from ZestCore/master 
Documentation Fix for Auth/Throttling API guide + 'from_native' bug
 2012-11-01 02:12:20 -07:00
Otto Yiu
756297ad1d fix 'from_native' method when rel is None 
'NoneType' object has no attribute 'to'
 2012-10-31 21:40:20 -07:00
Otto Yiu
96dc9ce1ad Fixing documentation on auth/throttling guides 2012-10-31 21:27:21 -07:00
Tom Christie
027c9079f6 PUT as create should return 201. Fixes #340. 2012-10-31 20:11:38 +00:00
Tom Christie
3a99170a73 Merge pull request #345 from minddust/master 
minor docs fix
 2012-10-31 04:02:50 -07:00
Stephan Groß
de2ef5d9c2 fixed typo 2012-10-31 11:12:09 +01:00
Tom Christie
4b2139c91a Merge pull request #344 from minddust/master 
minor docs fix
 2012-10-31 02:45:23 -07:00
Stephan Groß
7f7f0b6ffb added missing semicolon 2012-10-31 10:41:56 +01:00
Tom Christie
ecc55ca8f4 Added @asfaltboy. Thanks! 2012-10-31 09:39:32 +00:00
Tom Christie
a55dfaa488 Merge pull request #343 from asfaltboy/fix-docs 
Fixing tutorials
 2012-10-31 02:32:54 -07:00
Pavel Savchenko
a3ace366db using 'pk' in fields throws KeyError 
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-31 00:37:30 +02:00
Tom Christie
166025c0fc Package and doc tweaks 2012-10-30 14:48:48 +00:00
Tom Christie
1b62efe45e Docs to django-rest-framework.org 2012-10-30 14:41:44 +00:00
Tom Christie
555201a90f Update travis image to master 2012-10-30 14:37:07 +00:00
Tom Christie
9b30dab4f7 Merge branch 'restframework2' into rest-framework-2-merge 
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-30 14:32:31 +00:00
Tom Christie
4e7805cb24 Make docs ready to push to django-rest-framework.org 2012-10-30 14:18:23 +00:00
Tom Christie
a13aaea78d Merge pull request #341 from minddust/restframework2 
fix ModelSerializer useage
 2012-10-30 07:06:53 -07:00
Tom Christie
4cdd0b845e Final docs tweaks for 2.0 2012-10-30 13:59:31 +00:00
Stephan Groß
3216ac0224 added missing word + removed double whitespace 2012-10-30 14:53:38 +01:00