Tom Christie
1148b25ccf
Merge pull request #796 from maspwr/writable-nested-modelserializer
...
Fix model serializer nestesd delete behavior
2013-04-19 01:09:34 -07:00
Mark Aaron Shirley
fdc5cc3d81
Fix model serializer nestesd delete behavior
2013-04-18 10:28:20 -07:00
Tom Christie
eceae64804
Merge pull request #792 from maspwr/writable-nested-modelserializer
...
Writable nested modelserializer (merge in master)
2013-04-16 12:43:46 -07:00
Mark Aaron Shirley
c7e000e46e
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
...
Conflicts:
docs/api-guide/serializers.md
2013-04-16 09:55:47 -07:00
Tom Christie
23289b023d
Explicit error if dev does not return a response from the view
2013-04-16 14:32:46 +01: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
56c039ce17
Merge pull request #782 from maspwr/writable-nested-modelserializer
...
Update docs with allow_add_remove
2013-04-10 09:16:00 -07:00
Mark Aaron Shirley
bda25479aa
Update docs with allow_add_remove
2013-04-10 08:44:54 -07:00
Tom Christie
3f91379e4e
Fix 1.3 compat issue. Closes #780
2013-04-10 09:24:24 +01:00
Tom Christie
ce8ffd390a
Merge pull request #753 from maspwr/writable-nested-modelserializer
...
one-many writable nested modelserializer
2013-04-08 14:48:45 -07:00
Mark Aaron Shirley
73efa96de9
one-many writable nested modelserializer support
2013-04-06 08:43:21 -07: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
Tom Christie
ff3ebd979d
Merge pull request #766 from glic3rinu/master
...
Refactored urlize_quoted_links based on Dango 1.5 urlize
2013-03-29 06:40:23 -07:00
Tom Christie
2169c34a6f
Merge pull request #768 from kevinastone/master
...
Fixeds DjangoFilterBackend Incompatibility with SingleObjectMixin
2013-03-29 06:36:46 -07:00
Kevin Stone
4531ded061
Removed pagination regression special case for Django<1.4. Having DjangoFilterBackend return an actual query set fixes this issue.
...
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
2013-03-28 18:48:48 -07:00
Tom Christie
ea33511260
Change strapline
2013-03-28 16:02:20 +00:00
Tom Christie
69cbafc64f
Add search and next/prev
2013-03-28 15:58:53 +00:00
Tom Christie
d243538547
Note on using curl with token auth
2013-03-28 14:54:42 +00:00
Tom Christie
fb105d138c
Minor tweak
2013-03-28 14:54:25 +00:00
glic3rinu
9c32f048b5
Cleaned imports on templatetags/rest_framework module
2013-03-28 12:01:47 +01:00
glic3rinu
3774ba3ed2
Added force_text to compat
2013-03-28 12:01:08 +01:00
