encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-18 07:36:54 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,002 Commits 18 Branches 132 Tags 105 MiB
a1eba885e2
Commit Graph

5002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ethan Fremen
2ed79b6dc6 Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer 2013-06-12 14:23:20 -07:00
Tom Christie
1cc2a7b25e Added @davesque for work on #926. Thanks! :) 2013-06-12 22:46:07 +02:00
Tom Christie
614d8fec3c Merge pull request #929 from mhsparks/positive-integer-field 
Added test for custom fields with min_value and max_value validators
 2013-06-12 12:39:57 -07:00
Tom Christie
c4ab77b9e9 Merge pull request #926 from davesque/master 
I was having problems with a custom field that used a min_value validator...
 2013-06-12 12:38:35 -07:00
Tom Christie
be175ae8a7 Merge pull request #930 from inglesp/patch-1 
Typo
 2013-06-12 11:33:19 -07:00
inglesp
b1847412b5 Typo 2013-06-12 20:00:33 +02:00
Mark Hughes
82c515c19c Added test for custom fields with min_value and max_value validators 2013-06-12 17:36:16 +01:00
David Sanders
fcaca73709 Pep8 lint 2013-06-11 16:10:25 -06:00
David Sanders
656897c2da Update ModelField to work with a broader range of fields 
Add support for fields that use min and max value validators.
 2013-06-11 16:09:32 -06:00
Ethan Fremen
0e75bcd259 Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer 2013-06-10 10:29:25 -07:00
Tom Christie
5d0aeef69e Better docs related to lookup_field and hyperlinked serializers. Closes #920. 2013-06-10 17:46:55 +01:00
Tom Christie
351e172d45 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-10 09:06:15 +01:00
Tom Christie
777ecb5141 Add renderer_classes kwarg when binding snippet_highlight explicitly. Closes #923 2013-06-10 09:05:44 +01:00
Tom Christie
5ce1d6c86b Added @mindlace for work on #922. Thx! 2013-06-08 09:38:21 +02:00
Tom Christie
7537bf937f Merge pull request #922 from mindlace-mp/master 
Set args and kwargs before initializing the request.
 2013-06-08 00:12:40 -07:00
Ethan Fremen
d89aade343 Allow the default router to have a custom name. 
Signed-off-by: Ethan Fremen <ethan@matterport.com>
 2013-06-07 19:49:18 -07:00
Ethan Fremen
ae2887ffc4 Set the args and kwargs before initializing the request. 
Allows get_parser_context to function correctly.

Signed-off-by: Ethan Fremen <ethan@matterport.com>
 2013-06-07 19:25:39 -07:00
Stephan Groß
75e3cbc903 Merge pull request #919 from ryankask/doc-duplicate-fix 
Remove pass statement before docstring.
 2013-06-07 06:15:16 -07:00
Ryan Kaskel
e483c4fed6 Remove pass statement before docstring. 2013-06-07 10:07:42 +01:00
Tom Christie
db8d61196a Merge pull request #915 from aburgel/fix-oauth-bad-consumer-key 
Fix serialization exception caused by non-existent consumer
 2013-06-06 00:58:54 -07:00
Tom Christie
4b96614b12 Merge pull request #914 from gnunamed/master 
Fix typos
 2013-06-06 00:57:13 -07:00
Tom Christie
40e09472d8 Never deepcopy validators. Closes #913 2013-06-06 08:56:39 +01:00
Alex Burgel
ecb8a460c9 Fix serialization exception when using non-existent consumer 2013-06-05 17:02:44 -04:00
gnunamed
fdb689f9b5 Update serializers.md 2013-06-05 13:53:00 -05:00
Tom Christie
181e4fddd0 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-05 13:45:43 +01:00
Tom Christie
f8a0d31d71 Remove ConfigurationError in favor of Django's ImproperlyConfigured 2013-06-05 13:45:28 +01:00
Tom Christie
f317699d47 Added @areski for docs fix #912. Thanks! 2013-06-05 14:36:40 +02:00
Tom Christie
9b7bee627d Merge pull request #912 from areski/master 
Fix on documentation - wrong reference at previous created view UserList / UserDetail
 2013-06-05 05:35:03 -07:00
Tom Christie
de00ec95c3 Merge master 2013-06-05 13:33:19 +01:00
Tom Christie
2ca243a114 Fix up tests and tox 2013-06-05 13:20:06 +01:00
Areski Belaid
ffdf633aa5 Fix on documentation - wrong reference at previous created view UserList / UserDetail 2013-06-05 14:19:36 +02:00
Tom Christie
f1251e8c58 Added trailing_slash argument to routers. Closes #905 2013-06-04 20:59:12 +01:00
Tom Christie
ffa27b840f Fix ModelField docs. Closes #909. 2013-06-04 20:23:16 +01:00
Tom Christie
c160e49321 Test cases and fix for plain-list relationships (ie not queryset) Closes #878. 2013-06-04 14:05:35 +01:00
Tom Christie
478f6ff94a Regression test for #840. Closes #840. 2013-06-03 21:21:47 +01:00
Tom Christie
87b8cb8524 Merge pull request #904 from menghan/fix-doc-typo 
fix doc typo
 2013-06-03 08:04:32 -07:00