Commit Graph

3561 Commits

Author SHA1 Message Date
Stephan Groß
aa16db9042 Merge branch 'datevalidation_2' of https://github.com/minddust/django-rest-framework into datevalidation_2
Conflicts:
	rest_framework/tests/filterset.py
2013-03-01 16:52:07 +01:00
Stephan Groß
4a2788a7be Update docs 2013-03-01 16:50:18 +01:00
Stephan Groß
9c964cf37b Add new ISO8601 setting + integration 2013-03-01 16:50:18 +01:00
Stephan Groß
a9d36d4726 Add docs update - part 1 2013-03-01 16:50:18 +01:00
Stephan Groß
f208d8d2bb Add drf settings + output format + testcases 2013-03-01 16:50:18 +01:00
Stephan Groß
ef5752f8b5 Fix for python 3 support 2013-03-01 16:48:20 +01:00
Stephan Groß
b2165cc76a Fix for python 3 support - thanks @Linovia 2013-03-01 16:48:20 +01:00
Stephan Groß
9157db5da0 Add better date / datetime validation (pull 2)
addition to #631 with update to master + timefield support
2013-03-01 16:48:20 +01:00
Stephan Groß
d20089c8d1 Update docs 2013-03-01 16:35:27 +01:00
Stephan Groß
29a54b5a77 Add new ISO8601 setting + integration 2013-03-01 16:24:25 +01:00
Stephan Groß
7e702439eb Add docs update - part 1 2013-03-01 15:03:27 +01:00
Stephan Groß
876a58e8bf Add drf settings + output format + testcases 2013-03-01 13:16:00 +01:00
Pierre Dulac
d4c2267187 Clean up some print and comments 2013-03-01 12:08:28 +01:00
Pierre Dulac
653fcf7e33 Use the correct doc link style 2013-03-01 12:02:03 +01:00
Pierre Dulac
9d5c306038 Improve the django-oauth2-provider import block
to avoid naming collision with `oauth2` used for OAuth 1
2013-03-01 11:53:30 +01:00
Pierre Dulac
aed3c13471 Merge branch 'master' into oauth2-authentication
Conflicts:
	rest_framework/tests/authentication.py
2013-03-01 11:50:11 +01:00
Craig de Stigter
84be169353 fix function names and dotted lookups for use in PrimaryKeyRelatedField.field_to_native (they work in RelatedField.field_to_native already) 2013-03-01 16:13:04 +13: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
swistakm
2eabc5c2b4 rfc5849 link with anchor 2013-02-27 11:02:50 +01:00
swistakm
55ea5b9460 import compat version of unittest 2013-02-27 10:58:13 +01:00
swistakm
dd355d511c oauth2 & django-oauth-plus installed only on 2.x 2013-02-27 10:56:04 +01: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
Stephan Groß
36d5b24b76 Fix for python 3 support 2013-02-26 11:42:50 +01:00
Stephan Groß
956a65f5af Fix for python 3 support - thanks @Linovia 2013-02-26 11:35:39 +01:00
swistakm
a4304458f5 runtest.settings fixed if django-oauth-plus or oauth2 are not installed
oauth_provider can be added to INSTALLED_APPS only if these packages are installed
2013-02-26 11:27:06 +01:00
swistakm
d84c2cf275 OAuth tests now are skipped unless django-oauth-plus and oauth2 are installed. 2013-02-26 11:25:27 +01:00
swistakm
59a6f5f463 Move oauth2 and django-oauth-plus imports to compat and fix some minor issues
- alias oauth2 as oauth
- remove rouge print
- remove docstring markups
- OAuthAuthentication.authenticate() now returns (user, token) two-tuple on success
- don't set request.user because it's already set
2013-02-26 11:22:21 +01:00
Stephan Groß
bfff356dd3 Add better date / datetime validation (pull 2)
addition to #631 with update to master + timefield support
2013-02-26 11:09:54 +01: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