encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-30 23:47:53 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,706 Commits 16 Branches 134 Tags 128 MiB
cba426b34c
Commit Graph

7706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
700df90da1 Merge https://github.com/shezi/django-rest-framework 2013-04-17 08:51:36 +01: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
Stephan Groß
cac6697025 Return Decimal instance instead of string 2013-04-15 15:24:14 +02:00
Stephan Groß
9d80f01bce Fix init call 2013-04-15 15:15:55 +02:00
Stephan Groß
c329d2f085 Add DecimalField to field_mapping 2013-04-15 13:11:41 +02:00
Stephan Groß
15f4013859 Remove rebase docs 2013-04-15 13:06:22 +02:00
Stephan Groß
8b44599aba Update release notes 2013-04-15 13:04:36 +02:00
Stephan Groß
37f7d8bc0f Fix unicodes 2013-04-15 13:02:18 +02:00
Stephan Groß
ad436d966f Add DecimalField support 2013-04-15 13:02:18 +02:00
Stephan Groß
ca221c6579 Fix unicodes 2013-04-15 12:55:29 +02:00
Stephan Groß
1b5382c146 Add DecimalField support 2013-04-15 12:40:18 +02: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
d75cebf756 Remove router bit from viewset docs 2013-04-11 15:48:41 +01:00
Tom Christie
e0020c5b03 Simplify get_object 2013-04-11 15:48:18 +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
76e039d70e First pass on automatically including reverse relationship 2013-04-10 22:38:02 +01: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
07af437361 Cleaning up around bits of API that will be pending deprecation 2013-04-09 19:47:16 +01:00
Tom Christie
9bb1277e51 Cleaning up around bits of API that will be pending deprecation 2013-04-09 19:37:19 +01:00
Tom Christie
1de6cff11b Cleaning up get_object and get_queryset 2013-04-09 19:06:49 +01:00
Tom Christie
dc45bc7bfa Add lookup_kwarg 2013-04-09 19:01:01 +01:00
Tom Christie
099163f81f Removed SingleObjectMixin and MultipleObjectMixin 2013-04-09 18:45:15 +01:00
Tom Christie
c73d0e1e39 Minor cleaning up on View 2013-04-09 18:22:39 +01:00
Tom Christie
027792c981 Viewsets and routers in seperate docs 2013-04-09 11:54:51 +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
371698331c Tweaks 2013-04-04 22:24:30 +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
fd3f538e9f Fix up view name/description tests 2013-04-04 21:48:23 +01:00
Tom Christie
f68721ade8 Factor view names/descriptions out of View class 2013-04-04 21:42:26 +01:00
Tom Christie
9e24db022c Commenting 2013-04-04 20:38:42 +01:00
Tom Christie
fb41d2ac8f Add support for action and link routing 2013-04-04 20:35:40 +01:00
Tom Christie
c785628300 Fleshing out viewsets/routers 2013-04-04 20:00:44 +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