Commit Graph

2794 Commits

Author SHA1 Message Date
Pierre Dulac
8845c0be88 Fix import errors 2013-03-06 22:42:09 +01:00
Marko Tibold
1037888505 Prevent warning: no files found matching '*.txt' under directory
'rest_framework/templates' (there are only .html files in the templates
directory).
2013-03-06 21:16:40 +01:00
Pierre Dulac
30e3775b8b Update the documentation
with a warning for incompatibility with Python 3
and taking @tomchristie advice into account on how to reformulate some
sentences
2013-03-06 19:16:57 +01:00
Pierre Dulac
cda21a306e Only add the django-oauth2-provider apps if the module is installed
otherwise log a warning
2013-03-06 19:16:13 +01:00
Pierre Dulac
6f5764105b Use the PyPI django-oauth2-provider version 2013-03-06 19:15:33 +01:00
Tom Christie
ddd7125a63 Tweak travis badge positioning. 2013-03-06 13:35:04 +00:00
Tom Christie
cdf7c778d8 Version 2.2.2 2013-03-06 12:29:56 +00:00
Tom Christie
5422eedd0a Add tox note. 2013-03-06 12:29:32 +00:00
Tom Christie
6135df56c6 Merge pull request #703 from tomchristie/datetime-formats
Datetime formats
2013-03-06 04:25:35 -08:00
Tom Christie
d260f1ec15 Add tox note. 2013-03-06 12:19:49 +00:00
Tom Christie
1106596c80 Clean ups to datetime formatting 2013-03-06 12:19:39 +00:00
Tom Christie
4f7b028a0a Updating docs 2013-03-05 20:57:35 +00:00
Tom Christie
c20ebe95f6 Merge datetime formats 2013-03-05 17:50:28 +00:00
Stephan Groß
17e0ff0fcd Add @iekadou for #700 support. thanks! 2013-03-05 18:45:09 +01:00
Stephan Groß
7464def4e3 Fix typo 2013-03-05 18:42:31 +01:00
Tom Christie
6e7ddd579b Docs tweak. 2013-03-05 17:39:34 +00:00
Tom Christie
6c2dbf1220 Minor docs tweak 2013-03-05 14:03:28 +00:00
Stephan Groß
d263abbf4d Merge pull request #700 from minddust/migration_fix
Fix authtoken migration
2013-03-05 05:52:41 -08: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ß
7db2332c40 Update release docs 2013-03-04 14:11:05 +01:00
Stephan Groß
b4c9b68c96 Add note for using authtoken with custom django user model and south 2013-03-04 14:09:59 +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
Dave Kuhn
104614c600 Modified to allow form overloading to take precedence over header. 2013-03-04 07:14:38 +11:00
Pierre Dulac
c449dd4f4d Properly fail to wrong Authorization token type 2013-03-02 20:17:14 +01:00
Pierre Dulac
8809c46ab5 Add new OAuth2 tests 2013-03-02 20:16:18 +01:00
Dave Kuhn
9dccbcbb38 Support for X-HTTP-Method-Override header 2013-03-03 00:23:32 +11:00
Pierre Dulac
721dc519ec Use django.utils to import the unittest module
for a cross python versions compatibility
2013-03-01 23:27:47 +01:00
Pierre Dulac
182edb3e9b Add django-oauth2-provider to .travis.yml 2013-03-01 21:25:42 +01:00
Stephan Groß
5e5cd6f7f7 Fix for django 1.3 compatibility 2013-03-01 17:15:39 +01:00
Stephan Groß
681ad6f537 Add none testcases to date, datetime, time 2013-03-01 17:04:30 +01:00
Stephan Groß
12905449a5 Add format class attributes 2013-03-01 16:59:47 +01:00
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