6249 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	d14bc3c4e1	Fix test cases for python3	2015-07-23 14:41:28 +01:00
Tom Christie	92008d3d16	None -> '' in the context of form field values	2015-07-23 14:36:23 +01:00
Tom Christie	90fe0fb881	Errors in browsable API on error. Closes #3024.	2015-07-23 14:31:25 +01:00
Tom Christie	6e6fa893e4	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-23 12:41:44 +01:00
Tom Christie	22631c73a7	Resolve assertion error with LimitOffsetPagination and erronous parameters. Closes #2920.	2015-07-23 12:41:35 +01:00
Tom Christie	e7d14532b0	Merge pull request #3178 from ilogik/master ... fixed a typo in docs	2015-07-23 11:21:33 +01:00
Adrian Mester	d9c934debd	fixed a typo in docs	2015-07-23 13:10:20 +03:00
Tom Christie	77e69451c1	Update CONTRIBUTING.md	2015-07-22 13:05:56 +01:00
Tom Christie	762a30dbda	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-22 12:36:43 +01:00
Tom Christie	f9c61e8090	Prominent notes on deprecation status of pagination settings. Closes #3173.	2015-07-22 12:36:32 +01:00
Tom Christie	cab981837f	Merge pull request #3172 from jpadilla/master ... Update quickstart.md	2015-07-20 07:17:59 +01:00
José Padilla	7f7e6b33ff	Update quickstart.md ... Closes #3171	2015-07-19 21:47:09 -04:00
Aider Ibragimov	205f388631	fix import sort order	2015-07-19 01:32:51 +03:00
Aider Ibragimov	c4f1c98572	fix lint issues	2015-07-19 01:22:57 +03:00
Aider Ibragimov	a1397ac699	fix bugs, move version branching to compat, update ModelSerializer mapping	2015-07-19 00:26:03 +03:00
Aider Ibragimov	d845157983	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into feature/filepathfield	2015-07-18 23:34:07 +03:00
Tom Christie	85cc8e9f1a	Merge pull request #3168 from tomchristie/error-on-erronous-commit-argument ... Helpful error on erronous 'serializer.save(commit=False)'	2015-07-17 12:50:06 +01:00
Tom Christie	138e9fcc8f	Helpful error on erronous 'serializer.save(commit=False)'	2015-07-17 12:39:22 +01:00
Tom Christie	b22658536d	Merge pull request #3165 from tomchristie/guardian-1-3-support ... Upgrade guardian support to 1.3.	2015-07-16 16:55:30 +01:00
Tom Christie	788aae2aaf	Upgrade guardian support to 1.3. Closes #3163.	2015-07-16 16:46:07 +01:00
Tom Christie	7b21336872	Rename model to play nice with Django 1.7.	2015-07-16 16:18:14 +01:00
Tom Christie	0b6eb4a881	Fix for Django 1.7 issue with long default verbose_name arguments on ChoiceField	2015-07-16 16:01:50 +01:00
Tom Christie	0ccb148183	Support QueryDict list arguments with ListField. Closes #3155.	2015-07-16 15:59:15 +01:00
Tom Christie	c940f15901	Internal use warning against HTMLFormRenderer. Closes #2773.	2015-07-16 15:50:51 +01:00
Tom Christie	8de13e7e9c	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-16 15:46:40 +01:00
Tom Christie	e14391e041	Fix for ModelSerializer ChoiceField with nonstandard args. Closes #3126.	2015-07-16 15:46:27 +01:00
Tom Christie	098ff83eb8	Merge pull request #3162 from lgiordani/fix_tutorial_serializer ... Removed import of unused django.forms.widgets	2015-07-16 15:36:55 +01:00
Leonardo Giordani	4f6eba3ce8	Removed import of unused django.forms.widgets	2015-07-16 16:25:01 +02:00
Tom Christie	713333d354	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-16 15:17:27 +01:00
Tom Christie	806b0b34da	Include nested objects in metadata for OPTIONS. Closes #3156. Closes #2915.	2015-07-16 15:17:18 +01:00
Tom Christie	5c264c0e1f	Merge pull request #3161 from tomchristie/allow-empty ... Added allow_empty flag	2015-07-16 14:34:36 +01:00
Tom Christie	264d423493	Added allow_empty flag for ListField, ListSerializer, ManyRelation, MultipleChoiceField.	2015-07-16 13:51:15 +01:00
Tom Christie	81709a2c73	Merge pull request #3160 from vstoykov/test-for-3153 ... Test for #3153	2015-07-16 13:49:59 +01:00
Venelin Stoykov	73c0ebc2d5	Test for #3153	2015-07-16 15:40:41 +03:00
Tom Christie	db40b7eb91	Add coverage to runtests. Closes #2936.	2015-07-16 12:39:01 +01:00
Tom Christie	a8acdbc388	Resolve issue with nested serializers in HTML forms. Closes #3153.	2015-07-16 12:04:38 +01:00
Tom Christie	cde7154c59	Runtests should not suppress stdout. In the context of a web app only serves to hide erronous print statements.	2015-07-16 11:50:22 +01:00
Tom Christie	d231f36588	Support default values being used for empty HTML fields. Closes #3130.	2015-07-16 11:47:40 +01:00
Tom Christie	7315ed8b00	Resolve browsable API form issues with nested serializers. Closes #3153.	2015-07-16 10:49:00 +01:00
Tom Christie	c879aaf398	page_size needs to be stored as state on CursorPagination. Refs 3147.	2015-07-16 10:26:16 +01:00
Tom Christie	0ea64f6b33	More docs on configuring a custom metadata class.	2015-07-16 10:19:27 +01:00
Tom Christie	a9f1d99cb5	Fix 'metadata' action on viewsets. Closes #3158. Closes #3157. Closes #3115.	2015-07-16 10:08:22 +01:00
Tom Christie	6b08e97b6a	Form fields should use textual only value representations. Closes #3139. Closes #2416. Closes #2558.	2015-07-14 15:47:13 +01:00
Tom Christie	8d306823b4	Update docs on ALLOWED_VERSIONS and DEFAULT_VERSION. Closes #2778.	2015-07-14 15:03:33 +01:00
Tom Christie	132eab7bbd	Raise helpful error when erronously including nested data in multipart post requests with test client. Closes #2919.	2015-07-14 14:49:44 +01:00
Tom Christie	c14ad7add7	Handle .choices for related fields when queryset argument is actually a mamanger instance. Closes #3145.	2015-07-14 13:31:24 +01:00
Tom Christie	1b51bcdbae	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-14 13:21:20 +01:00
Tom Christie	bca2ea35df	Ensure that realtionship fields '.choices' returns an empty dict when accessed with a read-only field. Closes #2910.	2015-07-14 13:21:08 +01:00
Tom Christie	9c952dcfe9	Merge pull request #3147 from tomchristie/uploadcare-cursor-limits ... Add `get_page_size` hook to `CursorPagination`	2015-07-14 12:44:13 +01:00
Tom Christie	468361425d	page_size should be local, not overwriting class attribute.	2015-07-14 12:32:27 +01:00