Commit Graph

4931 Commits

Author SHA1 Message Date
Matías Lang 18687f075d Documented an optional argument of HyperlinkedIdentityField
lookup_url_kwarg argument of HyperlinkedIdentityField wasn't documented
2014-12-23 12:22:10 -03:00
Remi Paulmier 6c5ff71278 fix the way to use textarea rather than input with models.TextField 2014-12-22 18:05:07 +01:00
Tom Christie 201e7eaa4b Merge pull request #2337 from BWStearns/master
use of double quotes broke the code highlighting.
2014-12-22 07:55:24 +00:00
Brian Stearns 3569674860 use of double quotes broke the code highlighting. 2014-12-21 18:53:35 -05:00
Tom Christie e4c7c10b00 Merge pull request #2331 from tomchristie/use-custom-list-serializer-for-pagination
Use custom ListSerializer for pagination if required.
2014-12-20 16:42:39 +00:00
Tom Christie ffb8d568e0 Merge pull request #2330 from tomchristie/better-blank-html-behavior
Better behavior with null and '' for blank HTML fields.
2014-12-20 16:40:27 +00:00
Tom Christie 03c4eb1130 Use custom ListSerializer for pagination if one is specified on the serializer. 2014-12-20 16:32:07 +00:00
Tom Christie 77e3021fea Better behaviour with null and '' for blank HTML fields. 2014-12-20 16:26:51 +00:00
Tom Christie d109ae0a2e Merge pull request #2010 from tanwanirahul/master
Ability to customize method names without creating a custom router
2014-12-19 16:09:01 +00:00
Rahul 8f0fef4b75 Updated documentation on url_path per suggestions. 2014-12-19 21:22:10 +05:30
Rahul b4a3e7f640 Updates url_path info per suggestion 2014-12-19 21:20:19 +05:30
Rahul 6aa0e307c9 Added documentation about url_path parameter for custom actions. 2014-12-19 20:31:21 +05:30
Tom Christie 80bacc5fb0 depth should reduce by one on each nesting level. Closes #2287. 2014-12-19 14:52:53 +00:00
tanwanirahul a8a3fedb5c Add url_path documention for detail_route decorator 2014-12-19 20:16:46 +05:30
tanwanirahul 2448cc8e85 Updated tests to use url_path attribute in list and detail decorators 2014-12-19 19:53:48 +05:30
tanwanirahul 92ebeaa040 Change decorator attribute name to url_path per suggestions 2014-12-19 19:52:59 +05:30
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 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 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