Commit Graph

3313 Commits

Author SHA1 Message Date
Tom Christie
0e8a01e5de Merge pull request #1010 from kevin-brown/issue_1008
Fixed arguments in assertion
2013-07-26 08:25:03 -07:00
Kevin Brown
9088c18da8 Added to the credits 2013-07-26 11:03:37 -04:00
Kevin Brown
103fed9667 Fixed reversed arguments in assertion 2013-07-26 10:59:51 -04:00
Stephan Groß
0fa9866848 Add @willkg for #1007 thanks! 2013-07-26 09:26:32 +02:00
Stephan Groß
e7c0565b37 Merge pull request #1007 from willkg/throttle-docs-fix-1006
Fix *Throttle class names in the docs
2013-07-26 00:24:45 -07:00
Will Kahn-Greene
3fbb4097e6 Fix *Throttle class names in the docs
* AnonThrottle -> AnonRateThrottle
* UserThrottle -> UserRateThrottle
* ScopedThrottle -> ScopedRateThrottle
* (cosmetic) removed one errant whitespace character

Fixes #1006.
2013-07-25 12:56:47 -04:00
Alex Burgel
db9672d304 Add support for removing field files by sending an empty string 2013-07-24 17:24:29 -04:00
Stephan Groß
c23412b51c Add @pzinovkin for #995 thanks! 2013-07-24 11:02:10 +02:00
Stephan Groß
dbc8bddd74 Merge pull request #995 from pzinovkin/patch-1
Updated EmailField error message.
2013-07-24 02:00:30 -07:00
Tom Christie
0eec692f9a Merge pull request #996 from speg/patch-1
added script block to list of blocks
2013-07-23 08:16:53 -07:00
Steve
61a242e27b added script block to list of blocks
Phew, was afraid I wouldn't be able to overwrite this section..
2013-07-23 10:40:54 -04:00
Pavel Zinovkin
b6d6feaa02 Fixed test 2013-07-21 22:43:19 +04:00
Pavel Zinovkin
2e18fbe373 Updated EmailField error message. This one already available in django translations.
https://github.com/django/django/blob/master/django/conf/locale/ru/LC_MESSAGES/django.po#L343
2013-07-21 17:03:58 +04:00
Tom Christie
0a92e1ad8c Merge pull request #985 from maspwr/writable-nested-modelserializer-docs
Update nested serialization docs
2013-07-20 13:18:55 -07:00
Tom Christie
596d76ffd4 Merge pull request #993 from kevin-brown/issue_984_docs
Made the CSRF documentation more clear
2013-07-20 01:24:38 -07:00
Kevin Brown
8f2e71a67f Modified documentation for CSRF as mentioned in #984 2013-07-19 19:49:20 -04:00
Tom Christie
84b5f478f3 Merge pull request #991 from ericbuehl/master
pedantic doc updates
2013-07-19 01:31:56 -07:00
Eric Buehl
b676cce61f pedantic doc updates 2013-07-18 19:03:38 -07:00
Tom Christie
82145e2b06 Only include APISimpleTestCase and APILiveServerTestCase from django 1.4 onwards 2013-07-15 21:54:13 +01:00
Tom Christie
3eaad89c16 Docs fix 2013-07-15 21:23:34 +01:00
Tom Christie
ce5e8f8946 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-07-15 11:39:24 +01:00
Tom Christie
ae63c49777 Added test case classes 2013-07-15 11:38:38 +01:00
Mark Aaron Shirley
b5dc6b6113 Fix docs typo 2013-07-14 18:18:39 -07:00
Mark Aaron Shirley
7815811fe3 Update nested serialization docs 2013-07-14 18:13:37 -07:00
Tom Christie
ae5219dc70 Merge pull request #983 from yprez/fix_doc_class_names
Fix Mixin class name in viewsets docs example
2013-07-14 10:43:19 -07:00
Yuri Prezument
77dd334026 Fix Mixin class name in viewsets docs example 2013-07-14 19:16:56 +03:00
Tom Christie
6de9b7c8ca Add note on ModelSerializer validation of both model fields and serializer fields. Refs #949 2013-07-11 21:02:47 +01:00
Tom Christie
1cfb1cf458 Added @cyroxx for work on #978 2013-07-10 21:14:18 +01:00
Tom Christie
edc3585652 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-07-10 21:12:27 +01:00
Tom Christie
91d0545361 Merge pull request #978 from cyroxx/fix_views_doc
Fix broken links in views doc
2013-07-10 11:03:50 -07:00
Matthias Jacob
453b7b03dd Fix broken links in views doc 2013-07-10 19:02:38 +02:00
Tom Christie
045ad73f69 Fixing up content negotiation docs 2013-07-10 14:32:10 +01:00
Tom Christie
77364d2b84 Add screenshot, and tweak docs 2013-07-09 14:00:53 +01:00
Tom Christie
cb95e0aab1 Merge pull request #970 from sebastibe/browsable-autocomplete-field-doc
Add recommendation about autocomplete widgets for the browsable API
2013-07-09 05:46:30 -07:00
Tom Christie
f94ce6e7cb Added @gertjanol for work on #976 - thank you :) 2013-07-09 13:13:56 +01:00
Tom Christie
3032a06c9b Use absolute import style 2013-07-09 13:12:28 +01:00
Tom Christie
bafc06e19c Merge pull request #976 from gertjanol/add-tokenadmin-model
Add an ModelAdmin for easy management of Tokens
2013-07-09 05:08:47 -07:00
Gertjan Oude Lohuis
db863be10c Add an ModelAdmin for easy management of Tokens 2013-07-09 12:19:13 +02:00
Sebastien Beal
997a93ac2e Add info about autocomplete widgets for browsable API 2013-07-07 19:04:47 +09:00
Tom Christie
b05eba70bd Drop invalid download_url from pypi setup 2013-07-05 10:38:21 +01:00
Tom Christie
8f79caf9d1 Use 'force_text', not 'unicode', for compat across python version 2013-07-05 09:07:18 +01:00
Tom Christie
676ab4971c Merge branch 'remove-hold-down-control-messages' of git://github.com/rouge8/django-rest-framework into rouge8-remove-hold-down-control-messages 2013-07-05 08:55:24 +01:00
Tom Christie
99794773cf Merge pull request #962 from tomchristie/test-client
APIClient and APIRequestFactory
2013-07-04 05:50:04 -07:00
Tom Christie
a890116ab3 Minor docs addition 2013-07-04 13:49:28 +01:00
Tom Christie
b88bdfb9a5 Add section on dynamically modifying fields. Refs #958 2013-07-04 13:30:56 +01:00
Philip Douglas
bf8e71c455 Merge pull request #1 from tomchristie/master
Update from main
2013-07-04 05:29:42 -07:00
Tom Christie
5fa100245c Update parser docstrings. Closes #968. 2013-07-04 12:47:35 +01:00
Tom Christie
0950d3e0ef Tweak docs 2013-07-04 08:02:08 +01:00
Andy Freeland
7d43f41e4a Remove 'Hold down "Control" ...' message from help_text
When getting the help_text from a field where `many=True`, Django
appends 'Hold down "Control", or "Command" on a Mac, to select more than
one.' to the help_text. This makes some sense in Django's ModelForms,
but no sense in the API.
2013-07-04 01:51:24 -04:00
Tom Christie
7c0019854b Horizontal rule for nicer formatting 2013-07-03 13:19:07 +01:00