encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 11:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,610 Commits 18 Branches 132 Tags 120 MiB
cb7d9ea5c9
Commit Graph

1610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Roberts
cb7d9ea5c9 cleaned up white space & docstring styling 2012-12-06 12:45:50 -07:00
Ben Roberts
7f28a78414 cleaned up last commit 2012-12-05 17:54:21 -07:00
Ben Roberts
705c7ad09d added tests and fix for unpickleable metadata in SortedDictWithMetadata 2012-12-05 17:43:47 -07:00
Marko Tibold
3868241f6a Update docs/api-guide/permissions.md 
@permission_classes takes a tuple or list.
 2012-12-05 15:09:06 +01:00
Stephan Groß
3e3ede71d2 Added @mvdwaeter. Thanks! 2012-12-03 12:47:12 +01:00
Tom Christie
45d28f49e0 Added @mhsparks. Thanks! 2012-12-02 11:04:34 -04:00
Tom Christie
56bb4a5b03 Merge pull request #448 from mhsparks/master 
Add setter to user property on request object
 2012-12-02 06:59:27 -08:00
Marko Tibold
3114b4fa50 Merge pull request #463 from mvdwaeter/patch-1 
Fixed typo in import statement of tutorial
 2012-11-30 13:32:08 -08:00
mvdwaeter
3e8336af50 Fixed typo in import statement of tutorial 2012-11-30 21:50:51 +01:00
Marko Tibold
52b12434d0 Merge pull request #458 from asfaltboy/fix_authtoken_response 
Fix authtoken response
 2012-11-30 11:58:10 -08:00
Tom Christie
8d485da483 Added @fabianbuechler. Thanks! 2012-11-29 19:05:34 -04:00
Tom Christie
c72a20c459 Merge pull request #452 from fabianbuechler/patch-1 
Renderer negotiation: media_type specificty evaluation weak
 2012-11-29 15:02:32 -08:00
Pavel Savchenko
1b9d0eefba fix forgotten 400 test 2012-11-29 09:35:22 +02:00
Marko Tibold
968f4a5ca4 Merge branch 'custom-serializer-form-class' of https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390 
Conflicts:
	rest_framework/fields.py
	rest_framework/renderers.py
Manually solved
 2012-11-29 01:10:32 +01:00
Marko Tibold
60def44ee2 Merge pull request #459 from onepercentclub/update-options 
Update django-filter to released version.
 2012-11-28 14:46:45 -08:00
Ben Konrath
2f6cecc9a4 Update django-filter to released version. 2012-11-28 23:22:10 +01:00
Pavel Savchenko
19f67bd578 also update test with response code 401 2012-11-28 23:05:33 +02:00
Pavel Savchenko
050e228edc Merge branch 'patch-2' of https://github.com/asfaltboy/django-rest-framework into fix_authtoken_response 2012-11-28 23:04:10 +02:00
Stephan Groß
0a4c9f0831 Merge pull request #456 from asfaltboy/fix_auth_token_docs 
Fix location of obtain_auth_token view
 2012-11-28 08:01:57 -08:00
Pavel Savchenko
7eec582d40 Better to return 401 when failing to authenticate 2012-11-28 17:04:36 +02:00
Pavel Savchenko
fd383b2b5e Fix location of obtain_auth_token view 2012-11-28 11:58:34 +02:00
Stephan Groß
11ef60b127 Added @yprez Thanks! 2012-11-28 07:32:12 +01:00
Stephan Groß
77fa98d839 Merge pull request #453 from yprez/docs_fix 
api-guide/views.md - add imports to code example
 2012-11-27 22:30:13 -08:00
Yuri Prezument
80be571b2e Import from correct place 2012-11-27 19:42:37 +02:00
Stephan Groß
24baf6425b Added @oaubert Thanks! 2012-11-27 18:33:56 +01:00
Stephan Groß
f3e598e753 Merge pull request #455 from oaubert/patch-2 
Tutorial: fix module name in section 3
 2012-11-27 07:56:55 -08:00
Stephan Groß
454929ee55 Merge pull request #454 from oaubert/patch-1 
Tutorial: fix module name in section 2
 2012-11-27 07:52:55 -08:00
Olivier Aubert
71129dc747 Tutorial: fix module name in section 3 
Again snippet -> snippets, but then it could be simpler (and possibly intended) to rename snippets to snippet in the first section of the tutorial.
 2012-11-27 15:30:14 +01:00
Olivier Aubert
af8beb90c2 Tutorial: fix module name in section 2 
snippet -> snippets (to match section 1).
 2012-11-27 15:19:49 +01:00
Yuri Prezument
e8a41322fb api-guide/views.md - add imports to code example 
* It wasn't clear where `Response` should be imported from.
 2012-11-27 11:42:25 +02:00
Fabian Büchler
731443b71e Renderer negotiation: media_type specificty evaluation weak 
The `DefaultContentNegotiation` handler uses

For example: Google Chrome sends an Accept-header of `Accept:text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8`, when I request a *.png URL.
After matching the media-types with the available renderers (in my case only a custom `PNGRenderer` with a `media_type='image/png'`), only `*/*;q=0.8` is left, which happens to have the same length as the "image/png" media-type defined by the renderer (9 characters).

The specificity of the renderer's media-type over the Accept-header's one is only determined by length.
Using your `_MediaType.precedence` would be preferable in my eyes.

Regards, Fabian
 2012-11-27 10:13:15 +01:00
Mark Hughes
85a921c7ef Added setter to user property 2012-11-24 17:18:32 +00:00
Tom Christie
fd89bca35f Version 2.1.6. AKA: I am a doofus. 2012-11-23 13:21:18 +00:00
Tom Christie
95aa99d8df Version 2.1.5 2012-11-23 13:09:14 +00:00
Tom Christie
412f737ab2 Typo. Fixes #437. 2012-11-23 13:09:14 +00:00
Tom Christie
7ade5add21 Merge pull request #439 from irrelative/master 
Cache all fields per serializer instance
 2012-11-22 16:17:47 -08:00
jedavis83@gmail.com
2e36e0c910 Remove unneeded and incorrect self reference 2012-11-22 12:22:30 -08:00
jedavis83@gmail.com
08e7818530 More consistent iteration over default_fields, per feedback. 2012-11-22 11:27:55 -08:00
jedavis83@gmail.com
e9944f82d1 Keep Serializer.fields API consistent while caching values. 2012-11-22 10:50:29 -08:00
Tom Christie
ac84c2ed2e Version 2.1.4 2012-11-22 17:49:53 +00:00
Tom Christie
ec437e3e0f Merge pull request #441 from dbachrach/master 
Add widgets for DateField and DateTimeField
 2012-11-22 02:17:20 -08:00
Tom Christie
db3dc79288 Added @maspwr for the partial updates work. Ta! 2012-11-22 10:16:47 +00:00
Tom Christie
4eaac26427 Added @dbachrach. Thanks! 2012-11-22 10:12:22 +00:00
Tom Christie
df545f7a25 Updated release notes. 2012-11-22 10:08:14 +00:00
Tom Christie
d031ccce6e Updated release notes. 2012-11-22 10:07:42 +00:00
Tom Christie
ba553b7dcd Merge pull request #438 from maspwr/partial-update 
Add support for partial serializer updates
 2012-11-22 02:05:46 -08:00
Mark Aaron Shirley
0876bed963 Merge remote-tracking branch 'upstream/master' into partial-update 2012-11-21 09:37:22 -08:00
Mark Aaron Shirley
1adfc41dc7 partial argument should override required 2012-11-21 09:36:37 -08:00
Tom Christie
b0bad35ef0 Tweak to work with serializer performance improvement 2012-11-21 17:32:32 +00:00
Stephan Groß
774d687a31 updated comparison due to pep8 programming recommendations 
http://www.python.org/dev/peps/pep-0008/#programming-recommendations
 2012-11-21 14:58:33 +01:00