encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 03:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,982 Commits 18 Branches 132 Tags 105 MiB
284f9faa07
Commit Graph

5982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
0f77c27d34 Merge branch 'master' of https://github.com/callorico/django-rest-framework into callorico-master 2015-08-20 12:30:33 +01:00
Tom Christie
75be91912c Allow AdminRenderer to function when pagination is disabled. Closes #3275. 2015-08-20 12:28:00 +01:00
Tom Christie
d86fd67895 Fix display of select multiple HTML fields. Closes #3290. 2015-08-20 12:11:14 +01:00
Tom Christie
b4b2dc18fa Clean-up refactoring of SearchFilter implementation 2015-08-20 11:35:32 +01:00
Tom Christie
aa4cd7e9d7 Guard against LimitOffsetPagination edge case. Closes #3303. 2015-08-20 10:12:52 +01:00
Tom Christie
ed65db367a Merge pull request #3300 from jpadilla/listfield-child 
Raise error when `source=` use on a child.
 2015-08-19 18:23:14 +01:00
José Padilla
8af366a732 Raise error when source= use on a child. 
Closes #3292
 2015-08-19 12:32:16 -04:00
Tom Christie
dd850df1d8 Merge pull request #3299 from kennydude/patch-1 
Add import to example for filtering
 2015-08-19 15:01:04 +01:00
Joe Simpson
a4af8cc623 Add import to example for filtering 
`from rest_framework import filters` was missing from one of the examples
 2015-08-19 14:44:40 +01:00
Tom Christie
7b0252a91c Merge pull request #3296 from FlorianHoornaar/patch-1 
Fix typos in comments
 2015-08-19 07:32:14 +01:00
Florian Hoornaar
1b5bc07d4c Fix typos in comments 2015-08-19 03:55:39 +02:00
Tom Christie
bed3c45161 Merge pull request #3288 from thedrow/feature/cached-field-root-and-context 
Cached the field's root and context property
 2015-08-18 10:50:32 +01:00
Omer Katz
792005806b Cached the field's root and context property. 2015-08-18 12:38:13 +03:00
Tom Christie
1b53e804ee 3.2.2 Release 2015-08-13 10:23:22 +01:00
Tom Christie
0e6c467851 Merge pull request #3263 from jgadelange/master 
Resolved issue with rendering of nested serializers form when value is None
 2015-08-13 10:16:19 +01:00
Tom Christie
ff5fdeef73 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-13 09:56:10 +01:00
Tom Christie
18af181191 Fix boolean checkboxes setting to False. Closes #3258. Closes #2776. 2015-08-13 09:56:03 +01:00
Tom Christie
7bfc147cc2 Merge pull request #3268 from ThaJay/patch-1 
Update 2-requests-and-responses.md
 2015-08-13 00:06:58 +01:00
ThaJay
76fedcc348 Update 2-requests-and-responses.md 
just a small error, the trailing slash in the url should be omitted when adding a .suffix
 2015-08-12 19:49:43 +02:00
Jeffrey de Lange
f5a9904cc8 Resolved issue with rendering of nested serializers form when value is None 2015-08-11 20:27:41 +02:00
Tom Christie
a3e64fbe0d Resolve issue with rendering nested serializer forms with empty values. Closes #3260. 2015-08-11 16:25:02 +01:00
Tom Christie
0df99a6c95 Fix erronous request.files docs, and incorrect request.FILES behavior. Closes #3261. 2015-08-11 16:21:02 +01:00
Tom Christie
b7e47e3d67 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-11 09:24:16 +01:00
Tom Christie
83e49dbe63 Fix checkbox input display. Refs #3258. 2015-08-11 09:23:49 +01:00
Tom Christie
4509dbc24e Merge pull request #3241 from jpadilla/master 
Raise error if passed a serializer instance
 2015-08-10 17:41:01 +01:00
Tom Christie
e0c93c1780 Tweaking display_value docs 2015-08-10 16:37:55 +01:00
Tom Christie
2d5e8dea15 Merge pull request #3255 from jamesbeith/issues/#3254-display-value 
Add a method to return the string value used in `choices` of a `RelatedField`
 2015-08-10 16:32:29 +01:00
James Beith
5c0a2b79b3 Remove converting a string in to a string 
The `display_value` method returns a text type.
 2015-08-10 15:33:04 +01:00
James Beith
eaf61449a8 Explain use case for display_value in docs 2015-08-10 13:02:07 +01:00
James Beith
66ae19229e Add docs for display_value 2015-08-10 12:38:27 +01:00
James Beith
e9d9cb7011 Add tests for display_value 2015-08-10 12:19:46 +01:00
James Beith
2f6e5d0509 Add display value method 
Returns the text representation of the instance. Subclasses can override this method to provide a different display value used for populating the `choices` property.
 2015-08-10 11:03:57 +01:00
Ryan Kaneshiro
bc6bf7236b Add test to repro duplicate validation error 
Using the ModelSerializer with a model containing a GenericIPAddressField
produces duplicated validation error messages.
 2015-08-07 16:53:43 -07:00
José Padilla
7a0416c50b Raise error if passed a serializer instance 2015-08-07 13:12:37 -04:00
Tom Christie
0cbfbc27d8 Tweak erronous assignment 2015-08-07 15:41:46 +01:00
Tom Christie
3ea394dbff Version 3.2.1 2015-08-07 14:55:18 +01:00
Tom Christie
fbd05aba57 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-07 14:47:09 +01:00
Tom Christie
e88f28dbad Call out supported versions. Closes #3232. 2015-08-07 14:47:00 +01:00
Tom Christie
368fb9fb2a Merge pull request #3238 from kezabelle/bugfix/3235 
Fixed #3235 - ListField now returns the QueryDict value even if it's a list of only one item.
 2015-08-07 14:44:32 +01:00
Tom Christie
65e1c938eb Fix for 1, 0 being rendered as true, false in the admin. Closes #3227. 2015-08-07 14:38:36 +01:00
Tom Christie
e63dcab8b3 Fix for rendering select templates on relationships 2015-08-07 14:36:00 +01:00
Tom Christie
88609ba3a3 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-07 14:24:37 +01:00
Tom Christie
19c1976fcc Leave requests.FILES alone, for compat with regular Django requests. Closes #3239. 2015-08-07 14:24:28 +01:00
Keryn Knight
0078f66104 Fixed #3235 - A querydict which yields a list with only one value now correctly returns the provided data. 2015-08-07 11:43:17 +01:00
Keryn Knight
08d60f5cc2 Refs #3235 - Test demonstrating a single value passed to ListField is lost. 2015-08-07 11:41:56 +01:00
Tom Christie
981265fc48 Merge pull request #3231 from maryokhin/feature/drf3.2-readme 
Update README with 3.2 release
 2015-08-07 11:26:13 +01:00
Tymur Maryokhin
85e3edd7ff Update README and docs with 3.2 release 2015-08-07 12:12:01 +02:00
Tom Christie
77867e1eef Merge pull request #3230 from maryokhin/master 
Fully drop Django 1.4 support
 2015-08-07 09:57:28 +01:00
Tymur Maryokhin
4e5da16961 Remove Django 1.4 compat code 2015-08-07 00:02:29 +02:00
José Padilla
2fd5b8a2f9 Merge pull request #3229 from charettes/3.2-announcement-typo 
Fixed a small typo in the 3.2 release announcement.
 2015-08-06 17:55:34 -04:00