encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 02:53:58 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,227 Commits 18 Branches 132 Tags 105 MiB
30e3775b8b
Commit Graph

2227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephan Groß
ff7725f05e added support for custom slug field and kwargs 
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-31 15:30:01 +01: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
Stephan Groß
aa081678d5 added missing word 2012-10-30 14:38:23 +01:00
Stephan Groß
a967187b41 fixed typo 2012-10-30 14:36:37 +01:00
Stephan Groß
abf7f11619 fixed typo 2012-10-30 14:11:36 +01:00
Stephan Groß
bcfb46eedc removed empty row 2012-10-30 14:02:12 +01:00
Stephan Groß
9aa3726009 fix ModelSerializer useage 
cause of:
from snippets.models import Snippet
 2012-10-30 13:50:07 +01:00
Tom Christie
41ab18b13e Docs update 2012-10-30 12:23:17 +00:00
Tom Christie
29bc52096a Docs tweaks for tutorial. 2012-10-30 11:55:02 +00:00
Tom Christie
cea907f172 Raise nicer exception if queryset not Set on writable related field. Refs: #338 2012-10-30 11:10:23 +00:00
Tom Christie
0047a46020 Merge fixes for 'blank=True' fields. Fixes #324, Fixes #325 
Thanks to @Roarster.
 2012-10-30 11:03:03 +00:00
Tom Christie
5670cb03bf Allow use of absolute URLs when deserializing hyperlinked fields 2012-10-30 10:49:01 +00:00
Tom Christie
1b6fe9abb4 Hyperlinked serializer tests 2012-10-30 10:35:30 +00:00
Tom Christie
51a53b497b Merge pull request #335 from tomchristie/related-field-as-instance 
Writable related fields should return a model instance from .from_native...
 2012-10-30 03:32:55 -07:00
Tom Christie
5f0d4ef2fc Update browser enhancments docs. Fixes #339. 2012-10-30 10:30:51 +00:00
Tom Christie
e5777a6168 Merge pull request #336 from markotibold/null_is_true_model_fields 
Null is true model fields
 2012-10-30 02:22:51 -07:00
Tom Christie
62ec3680dc Merge pull request #337 from markotibold/typos 
Fix some typos.
 2012-10-30 02:22:32 -07:00
Marko Tibold
4d90bb4af4 Fix some typos. 2012-10-30 00:30:52 +01:00
Marko Tibold
2068595297 Set a ModelSerializer field to required=False if the ModelField has null=True set. 2012-10-30 00:09:40 +01:00
Marko Tibold
6ccbdd10ad Adding failing tests that show null=True model fields are won't validate if their value is omitted. 2012-10-30 00:03:24 +01:00
Tom Christie
b6c90c0d68 Fix slug based put as create test 2012-10-29 17:20:06 +00:00
Tom Christie
215edc5dfa Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-10-29 17:09:01 +00:00
Tom Christie
d206c686a6 Fixes for urls with suffixes 2012-10-29 17:08:38 +00:00
Tom Christie
343da8e3cf PUT as create should return 200 2012-10-29 16:13:08 +00:00
Tom Christie
6b6f0e682b Merge pull request #331 from markotibold/test_put_as_create 
Test put as create
 2012-10-29 09:11:32 -07:00
Tom Christie
7e5b1501b5 Docs redirect 2012-10-29 15:26:48 +00:00
Tom Christie
ee8ab283f0 Style tweaks 2012-10-29 14:41:33 +00:00
Tom Christie
49f87cfbab Deal with None and missing values 2012-10-29 14:10:38 +00:00
Tom Christie
dfcb560f8f Fix up login styling 2012-10-29 13:57:46 +00:00
Tom Christie
752f191a76 Fix breadcrumbs 2012-10-29 13:18:51 +00:00
Tom Christie
f4edd92566 Writable welated fields should return a model instance from .from_native(), not a pk 2012-10-29 12:51:21 +00:00
Tom Christie
cf77fd6964 Tweak 2012-10-29 09:10:14 +00:00
Tom Christie
076ca51d6f Added @minddust. Thanks! 2012-10-29 08:53:12 +00:00