Commit Graph

740 Commits

Author SHA1 Message Date
swistakm
661c8f9ad5 fix mistake in docs 2013-01-28 13:05:52 +01:00
Michael Elovskikh
499d6424ae Merge branch 'upstream_master' into docs_patch_method
Conflicts:
	docs/api-guide/authentication.md
2013-01-28 16:26:16 +06:00
Michael Elovskikh
180c94dc44 Undo changes in browsable-api.md and browser-enhancements.md 2013-01-28 15:54:00 +06:00
Tom Christie
3bcd38b7d0 Notes on upgrading and versioning. Fixes #620. 2013-01-28 09:10:23 +00:00
Tom Christie
e682bfa54e Drop unneccessary source= argument. 2013-01-28 08:01:54 +00:00
Tom Christie
896477f650 Added @mktums for docs fix in #621. Thanks! 2013-01-28 07:54:03 +00:00
Tom Christie
b1ae82b498 And link to quickstart. 2013-01-28 07:52:22 +00:00
Tom Christie
b11628f429 Revert comment. 2013-01-28 07:52:04 +00:00
Tom Christie
fdd35cd266 Merge pull request #621 from mktums/patch-1
Update docs/tutorial/1-serialization.md
2013-01-27 23:50:23 -08:00
Tom Christie
a58145e20f Note auto_now, auto_now_add behavior. Refs #622. 2013-01-28 07:46:30 +00:00
Tom Christie
99ef0bcad9 Tweak description of example throttle. 2013-01-28 07:37:15 +00:00
Tom Christie
e649f2ec61 Example custom authentication. Fixes #301. 2013-01-28 07:36:57 +00:00
Tom Christie
cb219fa04f Example custom throttle. Fixes #300. 2013-01-28 07:30:28 +00:00
Tom Christie
84a33b0a1f Example custome permission. Fixes #299. 2013-01-28 07:29:50 +00:00
Mike TUMS
c1dc1860da Update docs/tutorial/1-serialization.md
Update for tutorials (manual serialization) to support HTTP PATCH method (partial update of instance)
2013-01-28 00:32:32 +04:00
Tom Christie
ccb4ef0811 Typo 2013-01-27 19:34:16 +00:00
Tom Christie
d4f38dece4 Fix link to django docs. 2013-01-27 17:32:54 +00:00
Tom Christie
a7479e02fa AJAX, CSRF & CORS documentation 2013-01-27 17:23:56 +00:00
Tom Christie
a75db4cfb8 Version 2.1.17 2013-01-26 20:59:15 +00:00
Tom Christie
a2dcf5e878 Fix pagination docs 2013-01-26 20:52:58 +00:00
Tom Christie
fa349f4b55 Added @guglielmo, for the tutorial fix in #614. Thanks! 2013-01-26 20:13:49 +00:00
Guglielmo
25f2d3b561 Update docs/tutorial/4-authentication-and-permissions.md
HTMLFormatter is in pygments.formatters.html
2013-01-25 18:16:14 +01:00
Tom Christie
a3e5521569 Add twitter follow button. 2013-01-24 13:01:42 +00:00
Tom Christie
4b0d4288c1 Tweak linking style. 2013-01-24 13:01:28 +00:00
Tom Christie
a57c0c5aae Docs tweak based on user feedback. 2013-01-23 19:03:55 +00:00
Tom Christie
4a4fe60e33 Merge pull request #603 from minddust/validation_error
Add failed testcase for fieldvalidation + fix
2013-01-23 01:21:26 -08:00
Stephan Groß
30046cae8c Add validate_<fieldname> bugfix to release notes 2013-01-23 07:55:00 +01:00
Tom Christie
cf52c0e044 Update release notes. 2013-01-22 17:42:06 +00:00
Tom Christie
998c245f72 Add twitter share button to index page. 2013-01-22 17:35:52 +00:00
Tom Christie
b7ab2aee46 Merge branch 'master' into unauthenticated_response
Conflicts:
	docs/api-guide/authentication.md
2013-01-22 09:11:38 +00:00
Tom Christie
65b62d64ec WWW-Authenticate responses 2013-01-21 21:29:49 +00:00
Tom Christie
e29ba356f0 Added @kevinastone, for work on extra test cases in #602. Thanks! 2013-01-21 17:53:27 +00:00
Tom Christie
2c76212e54 Add missing import to tutorial. Fixes #599 2013-01-20 16:38:32 +00:00
Tom Christie
42fcc3599c Added @brutasse for docs fix #600. Thanks! 2013-01-20 15:50:16 +00:00
Bruno Renié
9b9b6529bc Fixed reference to authtoken in the docs 2013-01-20 14:49:07 +01:00
Tom Christie
199fa766ff Update release notes 2013-01-19 17:00:20 +00:00
Tom Christie
af3fd09845 Tweak imports in tutorial. Fixes #597. 2013-01-19 15:31:21 +00:00
Tom Christie
4b61ead53f Added @nemesisdesign, for documentation on Apache mod_wsgi setup. Thanks!
Refs #588.
2013-01-18 22:30:03 +00:00
Tom Christie
73b69b9bb6 Rephrasing. 2013-01-18 22:26:36 +00:00
Tom Christie
fb5943bb64 Merge pull request #588 from nemesisdesign/patch-1
mod_wsgi specific documentation for WSGIPassAuthorization
2013-01-18 14:08:59 -08:00
Tom Christie
15ad94c611 Drop the curl notes. Unnecessary. 2013-01-18 22:06:41 +00:00
Tom Christie
bd089836a1 Note on setting ContentType. Fixes #589. Refs #586. 2013-01-18 22:01:33 +00:00
Tom Christie
0672401781 Update release notes. 2013-01-18 22:00:59 +00:00
Tom Christie
80a8d0f279 Update docs to reference DabApps commercial support 2013-01-18 14:04:26 +00:00
Michael Elovskikh
ed13754859 Added PATCH HTTP method to the docs 2013-01-17 17:17:53 +06:00
Federico Capoano
f19d4ea8b1 Update docs/api-guide/authentication.md
refined mod_wsgi
2013-01-16 17:17:07 +01:00
Federico Capoano
55cc745254 Update docs/api-guide/authentication.md
Added mod_wsgi specific instructions
2013-01-16 17:10:46 +01:00
Tom Christie
0f0a07b732 Note changes to Decimal rendering to json behavior. Fixes #582. 2013-01-16 14:41:57 +00:00
Tom Christie
fecfe57aef Updated release notes. 2013-01-16 14:36:37 +00:00
Tom Christie
0756ca1f42 Added @steve-gregory for nullable slug relation tests.
See: #585
2013-01-16 14:35:30 +00:00
Tom Christie
e1076cfb49 Added @radiosilence, for the timedelta encoding support. Thanks!
See: #584
2013-01-15 13:31:05 +00:00
Tom Christie
b4c43d5fe4 Update release notes 2013-01-15 13:29:21 +00:00
Stephan Groß
e32aaa29b8 Add @shezi thanks! 2013-01-15 14:00:32 +01:00
Tom Christie
79f635e0dd Modify tutorial to work with pygments 1.6rc. Fixes #581. 2013-01-15 09:33:24 +00:00
Tom Christie
190473f508 Tweak messagepack links 2013-01-14 17:38:45 +00:00
Tom Christie
a7e7c441a4 Add link to @mjumbewu's CSV package 2013-01-14 17:38:32 +00:00
Tom Christie
191135d7b0 Version 2.1.16 2013-01-14 09:20:44 +00:00
Richard Wackerbarth
08943c3e0a Format extensions have already been introduced.
If format extensions are used,
they must be used in the creation of the
reverse URLs.
2013-01-13 12:09:49 -06:00
Richard Wackerbarth
0987bed2f7 Minor gramatical correction 2013-01-12 12:36:21 -06:00
Stephan Groß
da85bb1ab3 Update django-filter link to pypi 2013-01-12 14:31:40 +01:00
Tom Christie
25a463be73 Update release notes. 2013-01-12 10:07:11 +00:00
Stephan Groß
919c5e1e01 Fix typo in permission_classes 2013-01-11 20:26:44 +01:00
Tom Christie
c09a579851 Added @wackerbarth. Thanks! 2013-01-11 08:57:06 +00:00
Richard Wackerbarth
7dd5c56f22 Make the whitespace uniform 2013-01-10 16:16:30 -06:00
Richard Wackerbarth
12efd78fcf Bringing up the Web API 2013-01-10 15:37:49 -06:00
Richard Wackerbarth
8efd9563a6 Some comment on the tutorial repository 2013-01-10 15:37:33 -06:00
Richard Wackerbarth
674c9029c1 Imply an additional element in infinite lists
This is to allow the addition of elements without
having to change existing lines of code
2013-01-10 15:37:15 -06:00
Tom Christie
cb235977f6 Include CSRF note in SessionAuthentication docs. 2013-01-09 09:22:23 +00:00
Mark Aaron Shirley
b298bf53f3 Update release notes 2013-01-08 08:35:41 -08:00
Marc Tamlyn
4df1172665 Fix reference to BasicAuthentication in settings. 2013-01-08 11:45:55 +00:00
Tom Christie
31b585f26a Note paginate_by=None usage. Fixes #555. 2013-01-07 21:13:10 +00:00
Tom Christie
36fa722ebb Merged to latest master 2013-01-07 21:04:52 +00:00
Tom Christie
e429f702e0 Fix PAGINATE_BY_PARAM docs. Refs #551 2013-01-07 20:17:52 +00:00
Tom Christie
d9df15f321 Added @juanriaza's djangorestframework-msgpack package to the docs. 2013-01-07 17:36:31 +00:00
Tom Christie
de00d3720e Added @mjtamlyn. Thanks! 2013-01-07 17:36:31 +00:00
Tom Christie
152e6d5c0a Added @michaelmior. Thanks! 2013-01-07 08:57:43 +00:00
Yuri Prezument
12bb25b372 Added @juanriaza. Thanks 2013-01-05 18:02:26 +02:00
Yuri Prezument
d7f3c86ad1 Updated release notes 2013-01-05 18:01:57 +02:00
Tom Christie
26f9acb45a Validation errors instead of exceptions when serializers receive incorrect types. Fixes #402. 2013-01-04 14:11:05 +00:00
Tom Christie
eb14278a3b Add proper validation for updating relational fields with incorrect types. Fixes #446. 2013-01-04 13:50:40 +00:00
Mark Shirley
466d4584ae Remove duplicate release notes line 2013-01-03 23:18:58 +01:00
Tom Christie
ad671022e1 Version 2.1.15 2013-01-03 22:14:11 +00:00
Tom Christie
4223786ddc Tweak release notes. 2013-01-03 22:11:50 +00:00
Tom Christie
a122856d46 Tweak behavior of hyperlinked fields with an explicit format suffix. 2013-01-03 21:50:28 +00:00
Tom Christie
bfea7f64ee Tweak behavior of hyperlinked fields that include an explicit format suffix. 2013-01-03 21:49:29 +00:00
Tom Christie
92ae08207a Drop unused private save_m2m flag 2013-01-03 21:49:01 +00:00
Tom Christie
05c72a5d30 Fix copyright notice and travis badge 2013-01-03 21:46:39 +00:00
Yuri Prezument
097f4c6962 Updated release-notes 2013-01-03 09:40:49 +02:00
Tom Christie
161432d78c Added @ahankinson, for PATCH support. Thanks! 2013-01-02 13:49:43 +00:00
Tom Christie
ef73160599 Added RetrieveUpdateAPIView 2013-01-02 13:46:19 +00:00
Mark Aaron Shirley
f62acf025e Update release notes 2013-01-01 18:06:22 +01:00
Tom Christie
eff833b39d Version 2.1.14 2012-12-31 08:53:49 +00:00
Tom Christie
8fad0a727a Relation fields move into relations.py 2012-12-31 08:53:40 +00:00
Tom Christie
af5c3c3bf4 Added @sebastibe. Thanks! 2012-12-30 07:51:07 +00:00
Tom Christie
275fcde5e6 Added @toranb - Thank you! 2012-12-29 16:59:01 +00:00
Tom Christie
3c7a636199 Updated release notes 2012-12-29 16:58:51 +00:00
Tom Christie
25398e8cf1 Update release notes 2012-12-29 13:33:03 +00:00
Tom Christie
923f81d269 Nested serializers now support nullable relationships, plus test. Fixes #384 2012-12-29 13:19:05 +00:00
Tom Christie
1f6af163fe Tweak quote 2012-12-29 12:15:15 +00:00
Tom Christie
5d4ea3d23f Add .validate() example 2012-12-28 12:59:24 +00:00
Tom Christie
3e4242fc43 django.contrib.staticfiles no longer needs to be in INSTALLED_APPS 2012-12-28 12:33:24 +00:00
Tom Christie
4b32cda5a8 Update release notes and documentation for 2.2.0 2012-12-27 17:53:07 +00:00
Tom Christie
9cc56a97b5 Added @akinfold for staticfiles changes. 2012-12-27 17:35:21 +00:00
Tom Christie
ed09d26fb8 Update docs/topics/release-notes.md 2012-12-23 18:50:17 +00:00
Tom Christie
ab991199cb Merge pull request #529 from reinout/reinout-slug-kwarg
slug_kwarg attribute doesn't work; it should be slug_url_kwarg
2012-12-21 02:06:33 -08:00
Reinout van Rees
5f9ecd1c7a slug_kwarg attribute doesn't work; it should be slug_url_kwarg 2012-12-21 10:42:40 +01:00
Tom Christie
79aea2f0d0 Version 2.1.12 2012-12-21 09:18:35 +00:00
Tom Christie
fb4bbf7d98 Added @treyhunner. Thank you! 2012-12-21 09:17:33 +00:00
Tom Christie
c097bcef58 Update release notes. 2012-12-19 22:42:11 +00:00
Tom Christie
566b9ff27b Added @joual - Thanks! 2012-12-19 22:41:00 +00:00
Tom Christie
c29b08ad43 Update release notes 2012-12-19 22:06:38 +00:00
Tom Christie
24581faceb Update release notes. 2012-12-18 18:23:28 +00:00
Tom Christie
9680b42b50 Version 2.1.11 2012-12-17 22:01:17 +00:00
Tom Christie
0418cebc58 Update contact details 2012-12-17 22:00:25 +00:00
Tom Christie
70714c2346 Version 2.1.10 2012-12-17 09:08:28 +00:00
Tom Christie
35f72cecb1 Fix model validation exclusions. Fixes #500. Fixes #506. 2012-12-15 20:40:41 +00:00
Tom Christie
1d24d1fc59 Added @sunscrapers. Thanks! 2012-12-14 20:14:42 +00:00
Tom Christie
e9eb47207a Update release notes. 2012-12-14 20:08:53 +00:00
Tom Christie
6f8b432677 Added @pilt. Thanks! 2012-12-14 20:08:43 +00:00
Stephan Groß
e198a2b376 added RetrieveUpdateAPIView 2012-12-13 16:57:17 +01:00
Stephan Groß
628e3bf001 Added @cmurtaugh. Thanks! 2012-12-12 08:59:19 +01:00
Colin Murtaugh
9188d487c3 Replaced SingleObjectBaseView with SingleObjectAPIView 2012-12-11 17:26:08 -05:00
Tom Christie
0824761f47 Version 2.1.9 2012-12-11 21:07:48 +00:00
Tom Christie
17b77fc446 Added @gkrappel. Thank you! 2012-12-11 21:07:11 +00:00
Tom Christie
80adaecc43 Added @annacoder. Thanks! 2012-12-11 09:04:47 +00:00
Tom Christie
ff01ae3571 Version 2.1.8 2012-12-08 13:01:03 +00:00
Tom Christie
c1be29418b Add link to json+hal hypermedia format. 2012-12-07 23:58:20 +00:00
Tom Christie
b170973993 Version 2.1.7 2012-12-07 22:36:30 +00:00
Tom Christie
21f7dcf7c6 Added release notes 2012-12-07 22:25:28 +00:00
Tom Christie
a463ddbb37 Merge pull request #470 from minddust/fix-#469
fixed #469 - RegexField <--> BrowsableAPI Bug
2012-12-06 14:58:18 -08:00
Tom Christie
26cfa02326 Added @roberts81. Thanks! 2012-12-06 22:56:23 +00:00
Tom Christie
6a5f4f2a90 Added @justanotherbody. Thanks! 2012-12-06 22:38:20 +00:00
Tom Christie
2938bc13b1 Added @reinout for the copy fixes. Thanks! 2012-12-06 16:30:22 -04:00
Tom Christie
1cf6a0469b Merge pull request #475 from reinout/master
Textual tutorial fixes
2012-12-06 12:27:12 -08:00
Reinout van Rees
7a110a3006 Two typo fixes.
Plural/singular fix.
Typo fixed.
2012-12-05 16:24:41 +01:00
Reinout van Rees
3f39828788 Small textual fixes. 2012-12-05 16:16:46 +01:00
Reinout van Rees
ee184b8629 Small textual fixes. 2012-12-05 16:08:13 +01:00
Reinout van Rees
cb4e857217 Textual fixes.
Added a sentence introducing the second view.
Fix one or two additional sentences.
2012-12-05 16:04:52 +01:00
Marko Tibold
3868241f6a Update docs/api-guide/permissions.md
@permission_classes takes a tuple or list.
2012-12-05 15:09:06 +01:00
Reinout van Rees
3417c4631d Fixed typos and fixed wording.
Some singular/plural fixes.
Fixed some 'serialise->serialize' kind of UK/US differences. The 'z' seems more common in the rest of the docs, so that's what I used.
Removed a half-finished-sentence left dangling somewhere.
2012-12-05 12:31:38 +01:00
Reinout van Rees
fc6dbb45e0 Fixed wording. 2012-12-05 12:20:03 +01:00
Stephan Groß
e044fa089b fixed #469 - RegexField <--> BrowsableAPI Bug 2012-12-04 09:40:23 +01:00
Stephan Groß
3e3ede71d2 Added @mvdwaeter. Thanks! 2012-12-03 12:47:12 +01:00
Tom Christie
45d28f49e0 Added @mhsparks. Thanks! 2012-12-02 11:04:34 -04:00
mvdwaeter
3e8336af50 Fixed typo in import statement of tutorial 2012-11-30 21:50:51 +01:00
Tom Christie
8d485da483 Added @fabianbuechler. Thanks! 2012-11-29 19:05:34 -04:00
Pavel Savchenko
fd383b2b5e Fix location of obtain_auth_token view 2012-11-28 11:58:34 +02:00
Stephan Groß
11ef60b127 Added @yprez Thanks! 2012-11-28 07:32:12 +01:00
Stephan Groß
77fa98d839 Merge pull request #453 from yprez/docs_fix
api-guide/views.md - add imports to code example
2012-11-27 22:30:13 -08:00
Yuri Prezument
80be571b2e Import from correct place 2012-11-27 19:42:37 +02:00
Stephan Groß
24baf6425b Added @oaubert Thanks! 2012-11-27 18:33:56 +01:00
Stephan Groß
f3e598e753 Merge pull request #455 from oaubert/patch-2
Tutorial: fix module name in section 3
2012-11-27 07:56:55 -08:00
Olivier Aubert
71129dc747 Tutorial: fix module name in section 3
Again snippet -> snippets, but then it could be simpler (and possibly intended) to rename snippets to snippet in the first section of the tutorial.
2012-11-27 15:30:14 +01:00
Olivier Aubert
af8beb90c2 Tutorial: fix module name in section 2
snippet -> snippets (to match section 1).
2012-11-27 15:19:49 +01:00
Yuri Prezument
e8a41322fb api-guide/views.md - add imports to code example
* It wasn't clear where `Response` should be imported from.
2012-11-27 11:42:25 +02:00
Tom Christie
fd89bca35f Version 2.1.6. AKA: I am a doofus. 2012-11-23 13:21:18 +00:00
Tom Christie
95aa99d8df Version 2.1.5 2012-11-23 13:09:14 +00:00
Tom Christie
ac84c2ed2e Version 2.1.4 2012-11-22 17:49:53 +00:00
Tom Christie
db3dc79288 Added @maspwr for the partial updates work. Ta! 2012-11-22 10:16:47 +00:00
Tom Christie
4eaac26427 Added @dbachrach. Thanks! 2012-11-22 10:12:22 +00:00
Tom Christie
df545f7a25 Updated release notes. 2012-11-22 10:08:14 +00:00
Tom Christie
d031ccce6e Updated release notes. 2012-11-22 10:07:42 +00:00
Mark Aaron Shirley
0876bed963 Merge remote-tracking branch 'upstream/master' into partial-update 2012-11-21 09:37:22 -08:00
Stephan Groß
9459289d7d updated comparison due to pep8 programming recommendations
http://www.python.org/dev/peps/pep-0008/#programming-recommendations
2012-11-21 13:35:20 +01:00
Stephan Groß
6ba4df8a27 Merge remote-tracking branch 'upstream/master' into regex_field
Conflicts:
	docs/topics/release-notes.md
2012-11-21 11:56:34 +01:00
Mark Aaron Shirley
3b43d41e91 Documentation changes for partial serializer updates 2012-11-20 15:57:54 -08:00
Tom Christie
3268c67343 Update docs/topics/release-notes.md 2012-11-20 23:33:56 +00:00
Tom Christie
8e8b23b6a9 Merge pull request #430 from j4mie/serializer-method-field
Serializer method field
2012-11-20 15:30:30 -08:00
Tom Christie
3227a357ce Added @irrelative for the mighty fine work. 2012-11-20 23:19:11 +00:00
Stephan Groß
86484668f6 added RegexField 2012-11-20 15:38:50 +01:00
Jamie Matthews
5f4c385a86 Add example use of SerializerMethodField to docs 2012-11-20 13:25:21 +00:00
Tom Christie
a44a94dd6e More docs tweaking. 2012-11-19 22:08:38 +00:00
Tom Christie
588e4dda6d Added release notes 2012-11-19 21:49:07 +00:00
Tom Christie
83f3770af1 Adding folks to the credits makes me happy. Good work @jonlil! 2012-11-19 21:47:34 +00:00
Tom Christie
ce5b186ca8 Docs tweaks. 2012-11-19 21:42:33 +00:00
Jamie Matthews
3ab8c4966d Tweaks to SerializerMethodField docs 2012-11-19 17:24:08 +00:00
Jamie Matthews
de5b071d67 Add SerializerMethodField 2012-11-19 17:22:17 +00:00
Robert Romano
f5f1ac49ec Update robromano fork with upstream master
Conflicts:
	docs/topics/credits.md
	docs/topics/release-notes.md
2012-11-18 21:07:44 -08:00
Tom Christie
f131e533ed Docs, docs, docs, docs, docs, docs 2012-11-18 17:57:07 +00:00
Tom Christie
346a79b170 Added @MechanisM - Thanks!
(That's a mighty kick ass Gravatar)
2012-11-17 00:29:15 +00:00
Eugene MechanisM
4068323df4 Missing import of "Permission" model in docs
Missing import of "Permission" model in docs
2012-11-17 04:03:43 +04:00
Tom Christie
2263ed8b94 Tweak 2012-11-16 23:24:36 +00:00
Tom Christie
0eba278e13 Improve pagination docs 2012-11-16 23:22:23 +00:00
Tom Christie
016ef5019f Version 2.1.3 2012-11-16 22:58:22 +00:00
Tom Christie
e801e21210 Merge pull request #422 from markotibold/max_length_for_modelserializers
Max length for modelserializers
2012-11-16 14:54:16 -08:00
Tom Christie
19b0516bfe Getting 2.1.3 release notes ready 2012-11-16 22:49:28 +00:00
Tom Christie
e40000c834 Merge pull request #408 from markotibold/file_and_image_fields
Added a FileField and an ImageField
2012-11-16 14:48:42 -08:00
Tom Christie
31f01bd631 Polishing to page size query parameters & more docs 2012-11-16 22:45:57 +00:00
Marko Tibold
f801e5d305 Simplified docs a bit for FileField and ImageField.
Added note about MultipartParser only supporting file uploads and Django's default upload handlers.
2012-11-16 23:44:55 +01:00
Marko Tibold
0076e2f462 Added brief docs for URLField and SlugField. 2012-11-16 23:23:34 +01:00
Tom Christie
9973cf329a Merge pull request #412 from minddust/custom_page_size_per_request
support for custom page size per request
2012-11-16 13:45:27 -08:00
Tom Christie
2f2bde69e4 Docs, tox and travis use django-filter 0.5.4 2012-11-16 20:58:49 +00:00
Tom Christie
c5765641a4 Fix typo 2012-11-16 17:28:08 +00:00
Marko Tibold
b4cfb46a56 WIP on docs for File- and ImageFileds. 2012-11-16 00:22:08 +01:00
Stephan Groß
3ae203a018 updated script to just use page_size_kwarg 2012-11-15 12:06:43 +01:00
Stephan Groß
b17a981800 updated release noted for page_size stuff 2012-11-15 11:24:17 +01:00
Stephan Groß
38e94bb8b4 added global and per resource on/off switch + updated docs 2012-11-15 11:15:05 +01:00
Rob Romano
d541e0c423 Merge branch 'master' of https://github.com/robromano/django-rest-framework
Conflicts:
	docs/api-guide/authentication.md
	docs/topics/credits.md
2012-11-14 13:01:43 -08:00
Rob Romano
321ba156ca Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, updated tests & docs. Left authtoken.urls in place as example. 2012-11-14 12:51:00 -08:00
Rob Romano
eb20b5663e Added documentation on how to use the token authentication login view. 2012-11-14 12:48:03 -08:00