Commit Graph

4995 Commits

Author SHA1 Message Date
Stephan Groß
b52beb0734 Merge pull request #1023 from jsummerfield/patch-5
Fix typos in routers.md
2013-08-03 02:38:25 -07:00
James Summerfield
4ff1dc6a11 Fixing typos in routers.md 2013-08-03 10:23:39 +01:00
Stephan Groß
e4144b5b67 Add @rlr for #1022 thanks! 2013-08-02 08:59:18 +02:00
Stephan Groß
f2c3a88fc5 Merge pull request #1022 from rlr/missing-comma
Add missing comma to generic view example.
2013-08-01 23:57:48 -07:00
Ricky Rosario
3802442c89 Add missing comma to generic view example. 2013-08-01 17:02:16 -04:00
Stephan Groß
9e9233f87f Merge pull request #1017 from minddust/third_party_docs
Add drf-any-permission docs entry #1014
2013-07-31 11:26:22 -07:00
Stephan Groß
e612103991 Fix typo 2013-07-31 20:25:28 +02:00
Stephan Groß
294d957361 Add drf-any-permission docs entry 2013-07-31 20:14:49 +02:00
Philip Douglas
c058ab36b1 Merge pull request #2 from tomchristie/master
Update to latest
2013-07-31 07:45:05 -07:00
Tom Christie
43a5f8183c Merge pull request #1015 from leandersikma/patch-1
Renamed wrong filename in the browsable API documentation.
2013-07-31 05:32:26 -07:00
leandersikma
56d19dcc1c Wrong name of the login_base html file.
Changed rest_framework/base_login.html to rest_framework/login_base.html (which is the correct name the user should extends in their templates).
2013-07-30 11:26:17 +02:00
Stephan Groß
205c626d6e Add @jimr for #1013 thanks! 2013-07-29 15:53:26 +02:00
Tom Christie
02ef6d3bd7 Merge pull request #1013 from Maplecroft/doc_fixes
Clarification to authtoken docs
2013-07-29 02:27:05 -07:00
James Rutherford
195b1af7ba Minor typo fix 2013-07-29 10:16:51 +01:00
James Rutherford
1a4ff1567e Updated authtoken docs to mention south migrations 2013-07-29 10:16:15 +01:00
Tom Christie
856dc855c9 Notes on customizing BrowsableAPIRenderer. Refs #1001 2013-07-29 09:21:20 +01:00
Tom Christie
6a6b2c9318 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-07-29 09:11:29 +01:00
Tom Christie
5c4bf5309d Docs about migrations and post_save.
Documentation detailing requirement to migrate prior to running `createsuperuser` if using an authtoken `post_save` signal.
Closes #987.  Thanks to @yprez.
2013-07-29 09:08:35 +01:00
Stephan Groß
e98c229e5a Add @coderigo for #1011 thanks! 2013-07-28 18:51:22 +02:00
Stephan Groß
f22efdc40f Merge pull request #1011 from coderigo/docs
Fix Tutorial5 serializers.py typo
2013-07-27 03:45:35 -07:00
Rodrigo Martell
3a898a11f7 Fix Tutorial5 serializers.py typo
[Issue #N/A]

A slight typo at Tutorial5 causing an Exception "name 'models' is
not defined". A subtle one that can confuse Python/Django noobs
like me.
2013-07-27 10:09:56 +10:00
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
Alex Burgel
eaae8fb2d9 Combined link_* and action_* decorators into detail_route and list_route, marked the originals as deprecated. 2013-07-15 18:35:13 -04:00
Alex Burgel
ca7ba07b4e Introduce DynamicDetailRoute and DynamicListRoute to distinguish between different route types 2013-07-15 17:59:37 -04:00
Alex Burgel
e14cbaf696 Changed collection_* decorators to list_* 2013-07-15 17:59:36 -04:00
Alex Burgel
f022743078 Rename router collection test case 2013-07-15 17:59:36 -04:00
Alex Burgel
8d521c068a Revert route name change and add key to Route object to identify different route types 2013-07-15 17:59:36 -04:00
Alex Burgel
57cf8b5fa4 Rework extra routes doc for better readability 2013-07-15 17:59:36 -04:00
Alex Burgel
5b11e23f6f Add docs for collection routes 2013-07-15 17:59:35 -04:00
Alex Burgel
d72603bc6a Add support for collection routes to SimpleRouter 2013-07-15 17:59:03 -04: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