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

2466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danilo Bargen
e5040fbf94 Catch ImproperlyConfigured exception in compat.py (fixes #803) 2013-04-30 23:24:33 +02:00
Tom Christie
5d357a9b08 Added @chenjyw for depth bugfix #802. Thanks! 2013-04-29 10:28:51 +02:00
Tom Christie
50873343b2 Merge pull request #802 from chenjyw/master 
Fix nesting issue with depth >=2
 2013-04-29 01:27:19 -07:00
JC
8cbb715f4c Changed definition of NestedModelSerializer to correct depth handling 2013-04-27 13:23:55 -07:00
JC
3b0fa3ebaa Changed DepthTest to have depth=2 2013-04-27 13:10:39 -07:00
Tom Christie
33a26a76f1 Typo 2013-04-27 16:35:42 +02:00
Tom Christie
73019f91fe Update docs on object-level permissions. 
Closes #801.
 2013-04-27 14:29:32 +02:00
Tom Christie
eaac152940 Added @forgingdestiny for login template work. 
Thanks!  (Refs: #794)
 2013-04-17 23:19:16 +02:00
Tom Christie
eb58596b89 Update release-notes.md 2013-04-17 23:17:08 +02:00
Tom Christie
ed7906c63d Merge pull request #794 from forgingdestiny/master 
Add branding block to login template
 2013-04-17 14:15:19 -07:00
Matt Majewski
f7fdcd55e4 Update browsable-api.md 
Add login template docs
 2013-04-17 12:27:48 -03:00
forgingdestiny
03c736338f extend base login template 2013-04-17 10:15:02 -04:00
forgingdestiny
33f494fcc8 add branding and style blocks 2013-04-17 10:14:36 -04:00
Tom Christie
ea55143a23 Version 2.2.7 2013-04-17 09:07:20 +01:00
Tom Christie
37fe0bf0de Remove unneccessary tests from #789, and bit of cleanup. 2013-04-17 09:03:24 +01:00
Tom Christie
700df90da1 Merge https://github.com/shezi/django-rest-framework 2013-04-17 08:51:36 +01:00
Tom Christie
23289b023d Explicit error if dev does not return a response from the view 2013-04-16 14:32:46 +01:00
Johannes Spielmann
750451f5b4 adding test case for generic view with overriden get_object() 2013-04-14 18:30:44 +02:00
Tom Christie
0c1b8b4f76 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-04-13 20:08:08 +01:00
Tom Christie
5a5a602f8a Allow overriding get_object to work correctly. Fixes #784 2013-04-13 20:07:36 +01:00
Tom Christie
80bec363ef Merge pull request #783 from vshih/master 
Remove redundant text.
 2013-04-11 03:11:00 -07:00
Victor Shih
b73dfb9cc1 Remove redundant text. 2013-04-11 01:48:25 -07:00
Tom Christie
3f91379e4e Fix 1.3 compat issue. Closes #780 2013-04-10 09:24:24 +01:00
Tom Christie
c2280e34ec Version 2.2.6 2013-04-04 21:53:15 +01:00
Tom Christie
ad9aa23198 Use consistent header style in tutorial part 5 2013-04-04 21:51:41 +01:00
Tom Christie
5b56639e7a Merge pull request #777 from glic3rinu/master 
Break long headers on the browsable API
 2013-04-04 05:17:19 -07:00
glic3rinu
77ac204429 Rephrased break_long_headers release notes line 2013-04-04 14:07:56 +02:00
glic3rinu
e8978eaf68 Added break_long_headers on the release notes 2013-04-04 14:02:20 +02:00
glic3rinu
b6c7730d7f Fixed comma detection in break_long_headers templatetag 2013-04-04 14:01:47 +02:00
glic3rinu
92b5db5939 Added break_long_headers on templatetags and base template 2013-04-04 12:11:04 +02:00
Tom Christie
df30b345b1 Update release-notes.md 2013-04-03 13:58:42 +02:00
Tom Christie
cd94cfc441 Added @preed for bugfix #772. Thanks! 2013-04-03 13:55:58 +02:00
Tom Christie
35b86ee52a Merge pull request #772 from preed/preed/ModelSerializer-bool-fix 
Don't have the ModelSerializer trust deserialized objects to not have re...
 2013-04-03 04:53:52 -07:00
Tom Christie
c39ef12de0 Update release-notes.md 2013-04-03 13:53:18 +02:00
Tom Christie
afd64dc51a Added @atlefren for bugfix in #776 2013-04-03 13:50:26 +02:00
Tom Christie
cb20216173 Merge pull request #776 from atlefren/master 
Proper import of errors from oauth_provider
 2013-04-03 04:48:46 -07:00
Atle Frenvik Sveen
80d28de034 Fix the fact that InvalidConsumerError and InvalidTokenError wasn't imported correctly from oauth_provider 2013-04-03 13:10:41 +02:00
Tom Christie
a18d3df0f6 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-04-03 09:21:04 +01:00
Tom Christie
74fbd5ccc5 Fix bug with inactive user accessing OAuth 2013-04-03 09:20:36 +01:00
J. Paul Reed
889558365b Don't have the ModelSerializer trust deserialized objects to not have redefine bool()ean-ness. 
If the model we're using the ModelSerializer for has redefined methods that act as a boolean (__bool__ or __len__), it may not return the object even though it is_valid(), and should.
 2013-04-02 01:41:40 -07:00
Tom Christie
5ed7032427 Merge pull request #771 from glic3rinu/master 
Fixed IPv6 support for urlize_quoted_links template tag
 2013-04-01 14:06:21 -07:00
glic3rinu
76d1c47905 Fixed IPv6 support for urlize_quoted_links 2013-04-01 20:15:05 +02:00
Tom Christie
7d7c03eb24 Added @vshih for docs fixes in #769. Thanks! 2013-04-01 17:09:36 +02:00
Tom Christie
64bcbb34d4 Merge pull request #769 from vshih/master 
Spelling/grammar fixes.
 2013-03-31 05:34:13 -07:00
Victor Shih
33ce7dfac4 Spelling/grammar fixes. 2013-03-30 20:28:27 -07:00
Tom Christie
399ac70b83 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-03-30 15:40:11 +00:00
Tom Christie
c4eda3a653 Tweak strapline 2013-03-30 15:39:25 +00:00
Tom Christie
2e06f5c832 Fix typo 2013-03-29 17:26:58 +00:00
Tom Christie
89f3c1f8c4 Update release-notes.md 2013-03-29 13:44:50 +00:00
Tom Christie
a69262a1cd Merge pull request #767 from tomchristie/fix-oauth2-token-only 
Fix OAuth 2 token only
 2013-03-29 06:42:24 -07:00