diff options
| author | Tom Christie | 2013-03-30 15:40:11 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-03-30 15:40:11 +0000 |
| commit | 399ac70b831d782b7d774950b59f3b2066ab86f7 (patch) | |
| tree | e123ad7e60bd45a7e5ba1fe12d596d200cb2392e /docs | |
| parent | c4eda3a653ada3110dd6c128f176b15071cb8cfe (diff) | |
| parent | 2e06f5c832479c8802f8bd8654fba5597ee228cc (diff) | |
| download | django-rest-framework-399ac70b831d782b7d774950b59f3b2066ab86f7.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api-guide/authentication.md | 2 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 757b8673..0eea31d7 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -300,7 +300,7 @@ The only thing needed to make the `OAuth2Authentication` class work is to insert The command line to test the authentication looks like: - curl -H "Authorization: Bearer <your-access-token>" http://localhost:8000/api/?client_id=YOUR_CLIENT_ID\&client_secret=YOUR_CLIENT_SECRET + curl -H "Authorization: Bearer <your-access-token>" http://localhost:8000/api/ --- diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e63aee49..62c31358 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`: ## 2.2.x series +### Master + +* OAuth2 authentication no longer requires unneccessary URL parameters in addition to the token. +* URL hyperlinking in browseable API now handles more cases correctly. +* Bugfix: Fix regression with DjangoFilterBackend not worthing correctly with single object views. + ### 2.2.5 **Date**: 26th March 2013 |