Commits · fdc5cc3d81679d30cd20acf063dc7dc74ad17d7a · edx / django-rest-framework

18 Apr, 2013 1 commit
- Fix model serializer nestesd delete behavior · fdc5cc3d
  Mark Aaron Shirley committed Apr 18, 2013
  
  fdc5cc3d Browse Files
16 Apr, 2013 2 commits
- Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer · c7e000e4
```
Conflicts:
	docs/api-guide/serializers.md
```
  Mark Aaron Shirley committed Apr 16, 2013
  c7e000e4 Browse Files
- Explicit error if dev does not return a response from the view · 23289b02
  Tom Christie committed Apr 16, 2013
  
  23289b02 Browse Files
13 Apr, 2013 2 commits
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 0c1b8b4f
  Tom Christie committed Apr 13, 2013
  
  0c1b8b4f Browse Files
- Allow overriding get_object to work correctly. Fixes #784 · 5a5a602f
  Tom Christie committed Apr 13, 2013
  
  5a5a602f Browse Files
11 Apr, 2013 2 commits
- Merge pull request #783 from vshih/master · 80bec363
```
Remove redundant text.
```
  Tom Christie committed Apr 11, 2013
  80bec363 Browse Files
- Remove redundant text. · b73dfb9c
  Victor Shih committed Apr 11, 2013
  
  b73dfb9c Browse Files
10 Apr, 2013 2 commits
- Update docs with allow_add_remove · bda25479
  Mark Aaron Shirley committed Apr 10, 2013
  
  bda25479 Browse Files
- Fix 1.3 compat issue. Closes #780 · 3f91379e
  Tom Christie committed Apr 10, 2013
  
  3f91379e Browse Files
08 Apr, 2013 1 commit
- Merge pull request #753 from maspwr/writable-nested-modelserializer · ce8ffd39
```
one-many writable nested modelserializer
```
  Tom Christie committed Apr 08, 2013
  ce8ffd39 Browse Files
06 Apr, 2013 1 commit
- one-many writable nested modelserializer support · 73efa96d
  Mark Aaron Shirley committed Apr 06, 2013
  
  73efa96d Browse Files
04 Apr, 2013 7 commits
- Version 2.2.6 · c2280e34
  Tom Christie committed Apr 04, 2013
  
  c2280e34 Browse Files
- Use consistent header style in tutorial part 5 · ad9aa231
  Tom Christie committed Apr 04, 2013
  
  ad9aa231 Browse Files
- Merge pull request #777 from glic3rinu/master · 5b56639e
```
Break long headers on the browsable API
```
  Tom Christie committed Apr 04, 2013
  5b56639e Browse Files
- Rephrased break_long_headers release notes line · 77ac2044
  glic3rinu committed Apr 04, 2013
  
  77ac2044 Browse Files
- Added break_long_headers on the release notes · e8978eaf
  glic3rinu committed Apr 04, 2013
  
  e8978eaf Browse Files
- Fixed comma detection in break_long_headers templatetag · b6c7730d
  glic3rinu committed Apr 04, 2013
  
  b6c7730d Browse Files
- Added break_long_headers on templatetags and base template · 92b5db59
  glic3rinu committed Apr 04, 2013
  
  92b5db59 Browse Files
03 Apr, 2013 9 commits
- Update release-notes.md · df30b345
  Tom Christie committed Apr 03, 2013
  
  df30b345 Browse Files
- Added @preed for bugfix #772. Thanks! · cd94cfc4
  Tom Christie committed Apr 03, 2013
  
  cd94cfc4 Browse Files
- Merge pull request #772 from preed/preed/ModelSerializer-bool-fix · 35b86ee5
```
Don't have the ModelSerializer trust deserialized objects to not have re...
```
  Tom Christie committed Apr 03, 2013
  35b86ee5 Browse Files
- Update release-notes.md · c39ef12d
  Tom Christie committed Apr 03, 2013
  
  c39ef12d Browse Files
- Added @atlefren for bugfix in #776 · afd64dc5
  Tom Christie committed Apr 03, 2013
  
  afd64dc5 Browse Files
- Merge pull request #776 from atlefren/master · cb202161
```
Proper import of errors from oauth_provider
```
  Tom Christie committed Apr 03, 2013
  cb202161 Browse Files
- Fix the fact that InvalidConsumerError and InvalidTokenError wasn't imported… · 80d28de0
```
Fix the fact that InvalidConsumerError and InvalidTokenError wasn't imported correctly from oauth_provider
```
  Atle Frenvik Sveen committed Apr 03, 2013
  80d28de0 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · a18d3df0
  Tom Christie committed Apr 03, 2013
  
  a18d3df0 Browse Files
- Fix bug with inactive user accessing OAuth · 74fbd5cc
  Tom Christie committed Apr 03, 2013
  
  74fbd5cc Browse Files
02 Apr, 2013 1 commit

Don't have the ModelSerializer trust deserialized objects to not have redefine bool()ean-ness. · 88955836

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.

committed Apr 02, 2013

88955836 Browse Files

01 Apr, 2013 3 commits
- Merge pull request #771 from glic3rinu/master · 5ed70324
```
Fixed IPv6 support for urlize_quoted_links template tag
```
  Tom Christie committed Apr 01, 2013
  5ed70324 Browse Files
- Fixed IPv6 support for urlize_quoted_links · 76d1c479
  glic3rinu committed Apr 01, 2013
  
  76d1c479 Browse Files
- Added @vshih for docs fixes in #769. Thanks! · 7d7c03eb
  Tom Christie committed Apr 01, 2013
  
  7d7c03eb Browse Files
31 Mar, 2013 2 commits
- Merge pull request #769 from vshih/master · 64bcbb34
```
Spelling/grammar fixes.
```
  Tom Christie committed Mar 31, 2013
  64bcbb34 Browse Files
- Spelling/grammar fixes. · 33ce7dfa
  Victor Shih committed Mar 30, 2013
  
  33ce7dfa Browse Files
30 Mar, 2013 2 commits
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 399ac70b
  Tom Christie committed Mar 30, 2013
  
  399ac70b Browse Files
- Tweak strapline · c4eda3a6
  Tom Christie committed Mar 30, 2013
  
  c4eda3a6 Browse Files
29 Mar, 2013 5 commits
- Fix typo · 2e06f5c8
  Tom Christie committed Mar 29, 2013
  
  2e06f5c8 Browse Files
- Update release-notes.md · 89f3c1f8
  Tom Christie committed Mar 29, 2013
  
  89f3c1f8 Browse Files
- Merge pull request #767 from tomchristie/fix-oauth2-token-only · a69262a1
```
Fix OAuth 2 token only
```
  Tom Christie committed Mar 29, 2013
  a69262a1 Browse Files
- Merge pull request #766 from glic3rinu/master · ff3ebd97
```
Refactored urlize_quoted_links based on Dango 1.5 urlize
```
  Tom Christie committed Mar 29, 2013
  ff3ebd97 Browse Files
- Merge pull request #768 from kevinastone/master · 2169c34a
```
Fixeds DjangoFilterBackend Incompatibility with SingleObjectMixin
```
  Tom Christie committed Mar 29, 2013
  2169c34a Browse Files