encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-22 03:49:06 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,903 Commits 18 Branches 132 Tags 120 MiB
435aef7738
Commit Graph

4903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
435aef7738 Merge branch 'master' into version-3.1 2014-12-19 11:53:05 +00:00
Tom Christie
e0096fe80c Merge pull request #2319 from maryokhin/master 
Assert fields in `exclude` are model fields
 2014-12-18 17:26:26 +00:00
Tom Christie
7105c1308e Add OPTIONS/metadata to docs index 2014-12-18 15:42:27 +00:00
Tymur Maryokhin
d60ecfc498 Assert fields in exclude are model fields 2014-12-18 16:03:15 +01:00
Tom Christie
fcdef983b1 Merge pull request #2316 from tomchristie/project-management 
Added project management docs.
 2014-12-18 13:49:31 +00:00
Tom Christie
9c9d5bd859 Added project management docs. 2014-12-18 13:35:42 +00:00
Tom Christie
4ea1402916 Merge master 2014-12-18 12:24:16 +00:00
Tom Christie
b8bdf812c1 Merge pull request #2315 from tomchristie/yaml-encoder-fix 
YAML encoder fix for 3.0 serializers.
 2014-12-18 12:21:07 +00:00
Tom Christie
a68d9331fc YAML encoder fix for 3.0 serializers. 2014-12-18 12:17:46 +00:00
Tom Christie
1e531d2081 Merge pull request #2314 from tomchristie/drop-setup-py-test 
Drop 'setup.py test'. Just use 'runtests.py'.
 2014-12-18 11:55:10 +00:00
Tom Christie
af0f042462 Add pinned versions of wheels and mkdocs to our dev requirements. 2014-12-18 11:53:11 +00:00
Tom Christie
c8d88c8c8a Merge branch 'master' into version-3.1 2014-12-18 11:21:25 +00:00
Tom Christie
6909e92d22 Drop 'setup.py test'. Just use 'runtests.py'. 2014-12-18 10:58:08 +00:00
Tom Christie
d8803a35bd Merge pull request #2312 from tomchristie/check-for-wheel-before-pypi-publish 
Check for wheel install before allowing setup.py publish.
 2014-12-18 10:55:58 +00:00
Tom Christie
22ffeafc3e Merge pull request #2311 from tomchristie/allow-empty-text-or-boolean-html-input-if-not-required 
Fixes for behavior with empty HTML fields.
 2014-12-18 10:55:28 +00:00
Tom Christie
725bde29c7 Check for wheel install before allowing setup.py publish. 2014-12-18 10:40:40 +00:00
Tom Christie
1087ccbb25 Drop print statements in tests 2014-12-18 10:39:00 +00:00
Tom Christie
87ac64e41b Fixes for behavior with empty HTML fields. 2014-12-18 10:36:52 +00:00
Xavier Ordoquy
e8b46413a7 Merge pull request #2307 from epicserve/tutorial_6_doc_fix 
The pre_save method no longer works. This resolved issue #2306
 2014-12-18 00:09:01 +01:00
Brent O'Connor
7e9aac98fe The pre_save method no longer works. This resolved issue #2306 2014-12-17 16:54:04 -06:00
Tom Christie
b8af83493f Wheel check was breaking tests. Removed it. 2014-12-17 21:33:27 +00:00
Tom Christie
39766bcc0e Enforce wheel check before allowing 'setup.pu publish' 2014-12-17 21:18:06 +00:00
Tom Christie
c87e95c239 Add missing date 2014-12-17 21:11:06 +00:00
Tom Christie
15c2001de0 Merge pull request #2297 from tomchristie/version-3.0.2 
Version 3.0.2
 2014-12-17 21:04:08 +00:00
Tom Christie
e684aedffa Merge pull request #2305 from epicserve/tutorial_4_fixes 
With httpie 0.8.0 the HTTP method has to come after the auth argument.
 2014-12-17 20:48:38 +00:00
Brent O'Connor
4f33cfe1a0 With httpie 0.8.0 the HTTP method has to come after the auth argument. 2014-12-17 14:38:01 -06:00
Tom Christie
df29641f20 Merge pull request #2300 from maryokhin/master 
Docs/tutorial import fixes
 2014-12-17 16:32:18 +00:00
Tymur Maryokhin
eeb6e34064 Docs/tutorial import fixes. Refs #2296 2014-12-17 17:28:11 +01:00
Tom Christie
418108632c Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-17 16:23:20 +00:00
Tom Christie
90b8f9221e Use six.BytesIO in tutorial. Closes #2296. 2014-12-17 16:23:00 +00:00
Tom Christie
5f933f575e Merge pull request #2298 from epicserve/fix_typo 
Fixed a typo
 2014-12-17 16:20:22 +00:00
Brent O'Connor
530f7a21b3 Fixed a typo 2014-12-17 10:19:15 -06:00
Tom Christie
265ed9377e Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-17 16:19:13 +00:00
Tom Christie
c9a2ce0703 Expand permissions docs. Closes #2223. 2014-12-17 16:19:02 +00:00
Tom Christie
2adfb6c3aa Cleanup extra newline 2014-12-17 16:00:49 +00:00
Tom Christie
bbd55fafc5 Version 3.0.2 2014-12-17 15:58:30 +00:00
Tom Christie
ad6533e554 Merge pull request #2294 from tomchristie/fix-empty-html-values-with-default 
Fix empty HTML values when a default is provided.
 2014-12-17 15:24:01 +00:00
Tom Christie
ffc099a256 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-17 15:22:40 +00:00
Tom Christie
1ba822010d Highlight trailing '.' in command so it wont be missed. 2014-12-17 15:22:27 +00:00
Tom Christie
3fff5cb6e0 Fix empty HTML values when a default is provided. 2014-12-17 15:13:48 +00:00
Tom Christie
76cfc5eb8a Merge pull request #2291 from tomchristie/serializer-api-restrictions 
Serializer API restrictions.
 2014-12-17 14:46:45 +00:00
Tom Christie
c6137bbf5a Serializer API restrictions. 2014-12-17 14:14:51 +00:00
Tom Christie
426547c61c str() -> six.text_type(). Closes #2290. 2014-12-17 13:39:35 +00:00
Tom Christie
65fc0d0f77 Ensure request.auth is available to response middleware. 2014-12-17 13:22:52 +00:00
Tom Christie
7fbf5b0e6b Merge pull request #2155 from martinmaillard/set-user-on-wrapped-request 
Set authenticated user on wrapped request
 2014-12-17 13:12:01 +00:00
Tom Christie
47fe697707 Merge pull request #2285 from tomchristie/versioning 
Versioning
 2014-12-17 12:54:31 +00:00
Tom Christie
05a6eaec8a More docs, plus 'ALLOWED_VERSIONS' setting. 2014-12-17 12:41:46 +00:00
Tom Christie
70bd3a32f7 Minor comment tweak 2014-12-16 20:01:01 +00:00
Tom Christie
fe9647ce92 AcceptHeaderVersioning to return unicode strings. 2014-12-16 16:37:32 +00:00
Tom Christie
4e91ec6133 Added NamespaceVersioning 2014-12-16 16:14:08 +00:00