Commit Graph

2217 Commits

Author SHA1 Message Date
Pierre Dulac
aed3c13471 Merge branch 'master' into oauth2-authentication
Conflicts:
	rest_framework/tests/authentication.py
2013-03-01 11:50:11 +01:00
Pierre Dulac
d8f455bc0f Add OAuth2Authentication documentation 2013-03-01 02:09:52 +01:00
Pierre Dulac
da9d7fb8ec Add the OAuth2Authentication class 2013-03-01 02:08:58 +01:00
Pierre Dulac
592a0a5980 Add django-oauth2-provider to optionals.txt 2013-03-01 02:08:21 +01:00
Pierre Dulac
4e1f77db1a Add django-oauth2-provider to the installed apps 2013-03-01 02:07:53 +01:00
Pierre Dulac
468b5e43e2 Add tests for OAuth2 authentication 2013-03-01 02:06:20 +01:00
Tom Christie
282af6057f Release notes 2013-02-28 18:02:10 +00:00
Tom Christie
13b3af0d22 Auth is no longer lazy. Closes #667.
More consistent auth failure behavior.
2013-02-28 17:58:58 +00:00
Tom Christie
4e14b26fa9 Drop unused import 2013-02-28 13:42:08 +00:00
Tom Christie
183d3ec6a4 Move ModelSerializer field_mapping into an attribute for easier overriding. 2013-02-28 13:41:42 +00:00
Tom Christie
02ee6e5bf0 Fix out of date docstrings. Closes #689. 2013-02-27 22:15:28 +00:00
Tom Christie
27aa2d6aad Use plularized URLs for better consistency.
Closes #684.
2013-02-27 22:13:34 +00:00
Tom Christie
a2dafd9643 Merge pull request #692 from tomchristie/django1.5
Django 1.5
2013-02-27 13:15:47 -08:00
Tom Christie
a1dbd93f54 assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
Tom Christie
6e6f6f2c7d Update for Django 1.5 2013-02-27 21:14:40 +00:00
Tom Christie
35331f5820 More consistent examples 2013-02-26 19:54:04 +00:00
Tom Christie
e7ca326555 Tweaks 2013-02-26 19:51:09 +00:00
Tom Christie
19135061b6 Merge pull request #681 from dbrgn/format_suffixes_docs
Added function type detail to format suffix docs
2013-02-26 11:49:09 -08:00
Tom Christie
d59ed64915 Merge pull request #683 from dbrgn/serializer_exception_msg
Improved exception message for missing serializer model meta option
2013-02-26 11:46:07 -08:00
Stephan Groß
80b0234793 Add @waa for #687 thanks! 2013-02-26 14:50:10 +01:00
Stephan Groß
64a9486b93 Merge pull request #687 from wiliamsouza/master
Fix a  small typo in docs
2013-02-26 05:47:05 -08:00
Wiliam Souza
cd7f552540 Fixed a typo WritableField field name in docs 2013-02-26 10:43:33 -03:00
Danilo Bargen
bfdbc95f1a Added CBV example to format-suffixes docs 2013-02-26 10:30:42 +01:00
Danilo Bargen
e476dcb8c7 Changed AttributeError to AssertionError 2013-02-26 09:38:57 +01:00
Tom Christie
f00425c901 Merge pull request #680 from dbrgn/docs_userdetail
Renamed UserInstance to UserDetail in docs
2013-02-26 00:36:39 -08:00
Danilo Bargen
ec4d79bcaf Show class name in exception message 2013-02-25 23:02:42 +01:00
Danilo Bargen
3e6f99e273 Improved exception message for missing serializer model meta option 2013-02-25 22:34:05 +01:00
Danilo Bargen
70db398595 Renamed UserInstance to UserDetail in docs 2013-02-25 21:31:12 +01:00
Tom Christie
8da83f0df9 Added @thedrow for cleanups in #677. Thanks! 2013-02-25 15:15:33 +00:00
Tom Christie
7d4ee98691 Merge pull request #677 from thedrow/topic/tests_refactoring
Tests general cleanup
2013-02-25 07:13:41 -08:00
Omer Katz
c2c12858e5 Replaced status numbers with the statuses constants from the status model. 2013-02-25 16:59:40 +03:00
Omer Katz
62be5470b3 Fixed misspelled remark in comments. 2013-02-25 16:48:21 +03:00
Omer Katz
3221a088ab Fixed misspelled remark in comments. 2013-02-25 16:47:47 +03:00
Omer Katz
c05340c91b Fixed misspelled remarks in comments. 2013-02-25 16:47:07 +03:00
Omer Katz
cc13e95d5e Fixed misspelled remark in comments. 2013-02-25 16:44:44 +03:00
Tom Christie
b4b9d3b513 Added @ryanrdetzel for docs fix #674. Thanks! 2013-02-25 13:44:32 +00:00
Omer Katz
8d806d0cef Fixed misspelled remark in comments. 2013-02-25 16:44:19 +03:00
Tom Christie
42aaa9cc68 Merge pull request #674 from ryanrdetzel/master
Fix for example in authentication.html
2013-02-25 05:41:38 -08:00
Ryan Detzel
cd9a192027 method fix for custom authentication 2013-02-23 23:32:47 +01:00
Tom Christie
4599cd97cb Fix curl response.
Didn't map to the correct stage of the tutorial.
2013-02-23 22:13:06 +00:00
Tom Christie
ea7d73f57e Spelling. 2013-02-23 22:07:33 +00:00
Tom Christie
ca8e073e34 TODO -> TODONE 2013-02-23 22:01:29 +00:00
Tom Christie
4a80dff1ef Autenticating with curl example. 2013-02-23 21:52:46 +00:00
Tom Christie
9e2131715a Formatting. 2013-02-23 21:52:26 +00:00
Tom Christie
5b03de8287 Add curl examples. 2013-02-23 21:29:52 +00:00
Tom Christie
41d3fe09cf Add missing blank=True to model in tutorial. 2013-02-23 21:29:13 +00:00
Tom Christie
5432f9ba49 Fill in missing and incorrect settings. 2013-02-23 17:12:45 +00:00
Tom Christie
8a0007133a Update README.md 2013-02-23 08:39:57 +00:00
Tom Christie
f729506261 Update release notes 2013-02-23 07:24:36 +00:00
Tom Christie
e1f0001f92 Fix and test for #645
Yuck, pickle is weird.  Closes #645.
2013-02-22 23:00:07 +00:00