encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-25 05:01:28 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,872 Commits 17 Branches 134 Tags 148 MiB
45cfc6698a
Commit Graph

107 Commits

Author SHA1 Message Date
José Padilla
83c9136c90 Cleanup import following PEP 8 style guide 2015-06-25 16:10:17 -04:00
Tom Christie
166801063d Merge pull request #2743 from maurodoglio/serializer_class-html-renderer 
Use `serializer_class` for browsable API display, even on plain APIView.
 2015-03-23 09:43:39 +00:00
mdoglio
d0126b7e31 Set serializer_class on ObtainAuthToken view 2015-03-22 12:35:56 +00:00
mdoglio
fde02ae6eb AuthTokenSerializer - properly render password field 2015-03-22 12:13:28 +00:00
Tom Christie
4ee4b4f2dc Merge master 2015-01-30 14:00:25 +00:00
Lucas Wiman
a1eba885e2 Use the proper db_table argument when constructing meta 2015-01-27 19:30:44 -08:00
Craig Blaszczyk
91e316f781 prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings 2015-01-07 12:46:23 +00:00
Craig Blaszczyk
4c32083b8b use double quotes for user visible strings; end user visible strings in full stops; add some missing translation tags 2015-01-07 12:01:11 +00:00
Tymur Maryokhin
09e59f2686 Removed custom python_2_unicode_compatible. Closes #2183 2014-12-04 02:50:25 +01:00
Tymur Maryokhin
d9a09f7826 Removed unused import 2014-11-28 13:33:07 +01:00
Tymur Maryokhin
0539b1be01 Update token auth view. Closes #2151. 2014-11-28 12:27:05 +01:00
Tom Christie
05cbec9dd7 Use serializers.ValidationError 2014-10-17 13:23:14 +01:00
Tom Christie
d9a199ca0d exceptions.ValidationFailed, not Django's ValidationError 2014-10-10 14:16:09 +01:00
Tom Christie
2859eaf524 request.data attribute 2014-09-26 10:46:52 +01:00
Tom Christie
88008c0a68 Merge branch 'master' into version-3.0 2014-09-19 14:05:50 +01:00
José Padilla
de5fbf7d63 Update initial migration to work on Python 3 2014-09-17 10:23:53 -04:00
José Padilla
a37db382c6 Update authtoken latest Django 1.7 migration 2014-09-17 09:01:49 -04:00
Joe Binney
37d01f6088 Fix grammar in login error message 2014-09-10 20:27:52 -07:00
Tom Christie
f2852811f9 Getting tests passing 2014-09-02 17:41:23 +01:00
Tom Christie
bf09c32de8 Code linting and added runtests.py 2014-08-19 13:28:07 +01:00
Carlton Gibson
f34011f801 Allow use of native migrations in 1.7 2014-06-23 14:52:18 +02:00
Charlie Denton
ccf3c508bd Fix missing message in ValidationError 2014-05-02 21:58:49 +01:00
Charlie Denton
c15dab903d Mark strings in AuthTokenSerializer as translatable 2014-05-01 10:18:16 +01:00
Max Peterson
1c777ffe8b Ensure Token.generate_key returns a string. 2014-04-28 12:35:55 +01:00
Matthew King
f8cda8adbd Generate random token directly 2014-02-04 22:50:11 -05:00
Tom Christie
fc2dee844a Don't import compat.py from authtoken.models. Closes #1297 2013-12-16 08:59:10 +00:00
Tom Christie
3032a06c9b Use absolute import style 2013-07-09 13:12:28 +01:00
Gertjan Oude Lohuis
db863be10c Add an ModelAdmin for easy management of Tokens 2013-07-09 12:19:13 +02:00
Tom Christie
715bd47dfa Use AUTH_USER_MODEL consistently between various Django versions. Closes #946 2013-06-26 17:56:42 +01:00
Tom Christie
c5b98f0d10 authtoken abstract if not installed. 
Fixes #705.
 2013-03-08 20:56:30 +00:00
Stephan Groß
214e201ff8 Update migration 2013-03-04 17:12:02 +01:00
Stephan Groß
27175c2cf5 Update migration 2013-03-04 17:04:55 +01:00
Stephan Groß
d6391359f5 Fix fix migrate authtoken 2013-03-04 14:04:03 +01:00
Stephan Groß
4cdb6b2959 Fix authtoken migration 2013-03-04 13:53:39 +01:00
Tom Christie
d9c7b1c585 Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 
Conflicts:
	rest_framework/authentication.py
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/settings.py
	rest_framework/tests/authentication.py
	rest_framework/tests/genericrelations.py
	rest_framework/tests/generics.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_nested.py
	rest_framework/tests/relations_pk.py
	rest_framework/tests/serializer.py
 2013-02-01 11:58:55 +00:00
Marc Tamlyn
49cd5e59a8 ObtainAuthToken pluggable Serializer. 
It should have serializer_class in the same way as any other API view.
 2013-01-08 12:20:01 +00:00
Xavier Ordoquy
737349d238 Merge remote-tracking branch 'reference/py3k' into p3k 2013-01-02 16:09:21 +01:00
Tom Christie
c911d54ae3 Reverted #458 
When incorrect parameters are supplied to the obtain auth token view
400 *is* the correct response.
 2012-12-07 22:25:16 +00:00
Xavier Ordoquy
5fad46d7e2 Merge remote-tracking branch 'reference/master' into p3k 2012-12-02 12:43:32 +01:00
Pavel Savchenko
7eec582d40 Better to return 401 when failing to authenticate 2012-11-28 17:04:36 +02:00
Xavier Ordoquy
17000129e3 Every (base) test should now pass with python3. 2012-11-24 23:19:03 +01:00
Tom Christie
cafc00b8e5 Merge pull request #424 from jonlil/master 
Support for django 1.5a (auth_user_model)
 2012-11-19 13:44:53 -08:00
Jonas Liljestrand
0bcc840927 Complete fix for migration 2012-11-19 11:37:37 +01:00
Jonas Liljestrand
91c0249c9d fixed migration to support django 1.5 2012-11-18 21:12:06 +01:00
Jonas Liljestrand
8eb4bb8090 Moved function for getting correct user model to compat.py 2012-11-17 20:35:15 +01:00
Jonas Liljestrand
cd482c0ad2 Added support for Django 1.5 for TokenAuth 2012-11-17 18:04:37 +01:00
Jonas Liljestrand
bbb5a8a1d9 fixed import error 2012-11-17 18:01:46 +01:00
Jonas Liljestrand
3c1b5c3435 indent error 2012-11-17 17:53:08 +01:00
Jonas Liljestrand
f0d4232c1d Django 1.5 support, and awareness for AUTH_USER_MODEL 2012-11-17 17:46:16 +01:00
Rob Romano
535b65a348 Removed authtoken/urls.py, not really needed with Tom's simplification 2012-11-14 12:59:01 -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
ce3ccb91dc Updates to login view for TokenAuthentication from feedback from Tom 2012-11-14 12:46:14 -08:00
Rob Romano
bd92db3c67 Added authtoken login/logout urlpatterns and views 2012-11-14 12:46:14 -08:00
Rob Romano
4a2526bd1e Added authtoken login/logout urlpatterns and views to support scripted logins and logouts using TokenAuthentication. Added unittests. 2012-11-14 12:46:14 -08:00
Tom Christie
900c4b625b api_key -> auth_token to avoid TastyPie conflict 2012-10-10 09:50:15 +01:00
Tom Christie
5c17a60176 Tweak authtoken 2012-10-09 09:57:31 +01:00
Tom Christie
4b691c4027 Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +01:00