diff options
| author | Tom Christie | 2013-03-12 20:30:14 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-03-12 20:30:14 +0000 |
| commit | b6b686d285e376dbf4f2d2f15bd0e3ef0f1c3a37 (patch) | |
| tree | 1ef5df29e29dfd333240212f955e5b52b69b7a91 /docs/index.md | |
| parent | 2f1951910f264852b530c94c3a9946afe10eedd2 (diff) | |
| parent | 043d748b539a6f5b4cfdf6de650b072541f1c6da (diff) | |
| download | django-rest-framework-b6b686d285e376dbf4f2d2f15bd0e3ef0f1c3a37.tar.bz2 | |
Merge branch 'master' into basic-nested-serialization
Diffstat (limited to 'docs/index.md')
| -rw-r--r-- | docs/index.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/index.md b/docs/index.md index faad6afe..8e5097b3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -36,6 +36,10 @@ The following packages are optional: * [PyYAML][yaml] (3.10+) - YAML content-type support. * [defusedxml][defusedxml] (0.3+) - XML content-type support. * [django-filter][django-filter] (0.5.4+) - Filtering support. +* [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. +* [django-oauth2-provider][django-oauth2-provider] (0.2.3+) - OAuth 2.0 support. + +**Note**: The `oauth2` python package is badly misnamed, and actually provides OAuth 1.0a support. Also note that packages required for both OAuth 1.0a, and OAuth 2.0 are not yet Python 3 compatible. ## Installation @@ -180,6 +184,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [yaml]: http://pypi.python.org/pypi/PyYAML [defusedxml]: https://pypi.python.org/pypi/defusedxml [django-filter]: http://pypi.python.org/pypi/django-filter +[oauth2]: https://github.com/simplegeo/python-oauth2 +[django-oauth-plus]: https://bitbucket.org/david/django-oauth-plus/wiki/Home +[django-oauth2-provider]: https://github.com/caffeinehit/django-oauth2-provider [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [image]: img/quickstart.png [sandbox]: http://restframework.herokuapp.com/ |