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
3,438 Commits 18 Branches 132 Tags 105 MiB
193af483ef
Commit Graph

3438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
b36ece7f70 Merge branch 'writable-nested-modelserializer' of https://github.com/tomchristie/django-rest-framework into writable-nested-modelserializer 2013-06-28 09:07:51 +01:00
Tom Christie
58d38d694e Merge branch 'master' into writable-nested-modelserializer 2013-06-28 09:07:09 +01:00
Rudolf Olah
f5f23793e3 #955 updated documentation for overriding routes attribute in Router sub-classes 2013-06-27 16:30:24 -04:00
Tom Christie
1f6a59d76d Moar hyperlinks 2013-06-27 13:41:42 +01:00
Tom Christie
7ba2f44a0f Version 2.3.6 2013-06-27 13:00:05 +01:00
Tom Christie
124ae8c2c8 Tweak styling for max-height of sidenav 2013-06-27 12:58:38 +01:00
Tom Christie
e0dddbc5de Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-27 12:32:46 +01:00
Tom Christie
96f41fd12d Use imported views to expose python 2.6 bug. Refs #943 2013-06-27 11:58:34 +01:00
Tom Christie
7e67ad666b Merge pull request #953 from j4mie/prevent-duplicate-routing 
Prevent dynamically routing to a method that is already routed to.
 2013-06-26 15:37:42 -07:00
Tom Christie
4d22a65e78 Fix sidebar styling when browser window is too small 2013-06-26 23:26:35 +01:00
Jamie Matthews
c127e63c32 Raise exception when attempting to dynamically route to a method that is already routed to. Fixes #940 2013-06-26 23:00:42 +01:00
Tom Christie
af2fdc03a6 Update release notes 2013-06-26 22:45:39 +01:00
Tom Christie
cb83bc373f Added @trwired for fix #943. Thanks :) 2013-06-26 22:44:44 +01:00
Tom Christie
91b9fcb0ba Minor test cleanup 2013-06-26 22:43:17 +01:00
Tom Christie
b564008a01 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-26 22:41:52 +01:00
Tom Christie
35e4d1cf9c Merge pull request #943 from trwired/utf8safedocs 
Make browsable API views play nice with utf-8
 2013-06-26 14:41:07 -07:00
Tom Christie
494703fc8e Update release notes 2013-06-26 22:40:14 +01:00
Tom Christie
69e5e3cc0d Use timezone aware datetimes with oauth2 provider, when supported. Closes #947. 2013-06-26 21:18:13 +01:00
Igor Kalat
c8b0e6c40f Refactored get_view_description, moved appropriate tests to test_description.py 2013-06-26 22:12:02 +02:00
Tom Christie
715bd47dfa Use AUTH_USER_MODEL consistently between various Django versions. Closes #946 2013-06-26 17:56:42 +01:00
Tom Christie
13a3c993ab Fix incorrect example 2013-06-26 11:30:27 +01:00
Igor Kalat
2bf5f63050 Make browsable API views play nice with utf-8 2013-06-22 19:21:28 +02:00
Tom Christie
8d83ff8e6c Add decorator brackets back. Refs #941 2013-06-21 23:12:16 +01:00
Tom Christie
fb6bcd9f06 Update release notes, noting support for StreamingHttpResponse. Refs #939 2013-06-21 22:43:01 +01:00
Tom Christie
8cc63b09f6 Add support for StreamingHttpResponse. Closes #939 2013-06-21 22:42:04 +01:00
Tom Christie
4f7f93e20e Added @freakydug, for changes in #941. Thanks :) 2013-06-21 22:28:36 +01:00
Tom Christie
a68f473dd8 Brackets not required on decorator without arguments 2013-06-21 23:25:14 +02:00
Tom Christie
8b0d4115c6 Merge pull request #941 from FreakyDug/master 
Fixed a couple of small problems I found when using the action decorator.
 2013-06-21 14:23:40 -07:00
Tom Christie
2d5f7f201f Update router docs on base_name. Refs #933. 2013-06-21 22:19:14 +01:00
Tom Christie
209b65f426 Update assertion error to reference 'base_name' argument, not incorrect 'name' argument. Closes #933 2013-06-21 22:13:25 +01:00
Tom Christie
f2e6af8975 Remove erronous htmlcov files 2013-06-21 22:04:38 +01:00
Tom Christie
3d4bb4b553 Ensure action kwargs properly handdled. Refs #940. 2013-06-21 22:03:07 +01:00
Philip Douglas
fa9f5fb8dc Allow uppercase methods in action decorator. 
Previously, using uppercase for the method argument would silently fail
to route those methods.
 2013-06-21 16:28:17 +01:00
Philip Douglas
f3529f1f4a Correct docs' incorrect usage of action decorator 
If you don't call it, it doesn't work.
 2013-06-21 16:26:28 +01:00
Tom Christie
6d2ca75d8e Don't raise AttributeError on views with no model or queryset, when using DjangoModelPermissions 2013-06-18 11:10:56 +01:00
Tom Christie
da62987b82 Remove erronous checkin 2013-06-17 15:10:53 +01:00
Tom Christie
4ad1094968 HyperlinkedModelSerializer supports overriding of 'url' field. Closes #936 2013-06-17 15:09:36 +01:00
Tom Christie
a7a9e87284 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-17 09:27:38 +01:00
Tom Christie
aa706f581c Add Django OAuth Toolkit to docs 2013-06-17 09:27:12 +01:00
Tom Christie
c2f0a5ab77 Merge pull request #938 from bigsassy/master 
Fixed minor typo in tutorial documentation.
 2013-06-17 00:23:22 -07:00
bigsassy
c875a27edf Update 1-serialization.md 
Fixed typo in documentation (Testarea to Textarea)
 2013-06-16 18:32:33 -03:00
Tom Christie
ef38886fe8 Update release notes 2013-06-14 15:40:20 +01:00
Tom Christie
52298480c2 Clean up 2013-06-14 15:39:56 +01:00
Tom Christie
df957c8625 Fix and tests for ScopedRateThrottle. Closes #935 2013-06-14 14:18:40 +01:00
Tom Christie
6cc4fe5637 Drop coveralls as seems to be screwing with things 2013-06-14 12:55:48 +01:00
Tom Christie
702ec128ba Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-14 12:44:04 +01:00
Tom Christie
34f34f40b8 Adding coveralls to travis builds 2013-06-14 12:43:34 +01:00
Tom Christie
170709442b Merge pull request #931 from mindlace-mp/writable-nested-modelserializer 
Merged master into writable-nested-modelserializer.
 2013-06-13 00:10:23 -07:00
Tom Christie
982411e6f4 Merge pull request #932 from tobych/python-titlecase 
Changes 'python' to 'Python' when used in prose.
 2013-06-13 00:09:26 -07:00
Toby Champion
250dfef158 Changes 'python' to 'Python' when used in prose. 2013-06-12 14:51:17 -07:00