encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,893 Commits 18 Branches 132 Tags 105 MiB
27f84aa0f3
Commit Graph

4893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
27f84aa0f3 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-28 11:02:36 +00:00
Tom Christie
a636320ff3 Add import notes in docs. Closes #2357 2014-12-28 11:02:19 +00:00
Tom Christie
0d2f30c1d4 Merge pull request #2358 from fusionbox/manger_typo 
Typo manger => manager
 2014-12-27 08:22:55 +00:00
Rocky Meza
5b5652594a Typo manger => manager 2014-12-26 22:24:31 -07:00
Tom Christie
00531ec937 Release notes on non-text detail arguments. Closes #2341. 2014-12-26 15:48:16 +00:00
Tom Christie
c2e00a075c Paginated serializers should get context. 2014-12-26 15:25:13 +00:00
Tom Christie
9f9b9f8944 Merge pull request #2340 from shtouff/fix-htmlform-textarea 
Use textarea input for 'models.TextField'.
 2014-12-24 14:44:32 +00:00
Remi Paulmier
b32ecdefba modified the tests accordingly 2014-12-24 14:07:28 +01:00
Kevin Brown
e6041f9c3e Merge pull request #2348 from theengineear/compress-invalid-template 
Compress invalid template
 2014-12-23 17:35:39 -05:00
Andrew Seier
35768344db Remove ‘/‘ from inside variable block {{ }} 
manage.py compress —force causes a warning here.
 2014-12-23 12:12:22 -08:00
Andrew Seier
399cb165b0 Remove commented code (warning during compression) 
manage.py compress —force causes a warning here.
 2014-12-23 12:11:45 -08:00
Tom Christie
2645a32929 Merge pull request #2346 from sh4r3m4n/master 
Documented an optional argument of HyperlinkedIdentityField
 2014-12-23 15:28:46 +00:00
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