484 Commits

Author	SHA1	Message	Date
Xavier Ordoquy	dee5fb5647	Merge remote-tracking branch 'reference/master' into feature/ipaddress-fix ... Conflicts: docs/api-guide/fields.md	2015-06-04 14:21:33 +01:00
Xavier Ordoquy	14055dd3f4	Merge pull request #2989 from ticosax/duration-field ... Add DurationField	2015-06-01 17:38:57 +01:00
Nicolas Delaby	f701ecceb7	Add DurationField	2015-06-01 18:20:53 +02:00
Xavier Ordoquy	e3f856ff1d	Merge pull request #2975 from sheppard/read-only-nested ... can't create nested serializers for unique_together relations	2015-06-01 12:01:40 +01:00
Corentin Smith	fa29f7dd1f	Fix minor typo	2015-05-30 17:57:35 +02:00
S. Andrew Sheppard	8c7b5fc5c1	pop required extra_kwargs if read_only is set	2015-05-27 21:14:13 -05:00
Tom Christie	2eb9107b87	Merge pull request #2798 from Boomerangz/depth-should-reduce ... Depth should reduce on nested ModelSerializer classes.	2015-04-27 16:22:22 +01:00
Igor Zygin	2d5b4f4cc9	Depth should reduce ... Depth should reduce	2015-04-06 10:13:25 +06:00
Ilias Kiourktsidis	486f0a9367	Raise error when ModelSerializer used with abstract model	2015-03-23 15:01:19 +00:00
Aider Ibragimov	de72022f80	Merge branch 'master' of https://github.com/Ins1ne/django-rest-framework into feature/ipaddress	2015-02-28 14:29:27 +03:00
Aider Ibragimov	313b3d7c3b	Update ModelSerializer mappings	2015-02-28 10:18:47 +03:00
Danilo Bargen	86c5fa2401	Force-evaluate querysets (see #2602)	2015-02-25 18:54:47 +01:00
Tom Christie	dbd2352165	Fixes for latest pep8 updates. Refs #2563.	2015-02-17 10:58:00 +00:00
Tom Christie	fbb21caaaa	Merge master	2015-02-09 20:43:50 +00:00
Tom Christie	0240df1a38	Minor internal API cleanpu	2015-02-06 16:15:10 +00:00
Tom Christie	670723f021	Minor cleanups/improvements to ModelSerializer API	2015-02-06 15:45:02 +00:00
Tom Christie	1f99612845	Upgrade pending deprecations to deprecations	2015-02-06 13:21:35 +00:00
José Padilla	c696b0ba0c	Fix possible nested array fields	2015-02-05 10:12:14 -04:00
José Padilla	48fa77c09e	Add child to ListField when using ArrayField	2015-02-04 23:33:59 -04:00
Jason Yan	4b65e9e42b	Fixed missing whitespace in error string.	2015-02-02 16:14:34 -08:00
Omer Katz	8f1d42e7d5	Fixed typos in docstrings.	2015-02-02 10:50:54 +02:00
José Padilla	37dce89354	Add support for Django 1.8’s ArrayField	2015-02-01 15:33:34 -04:00
José Padilla	760b25bc20	Fix AttributeError on renamed _field_mapping	2015-01-30 11:36:03 -04:00
Tom Christie	4ee4b4f2dc	Merge master	2015-01-30 14:00:25 +00:00
Tom Christie	35f6a82462	Added DictField and support for HStoreField.	2015-01-23 16:27:23 +00:00
Tom Christie	e8db1834d3	Added UUIDField.	2015-01-23 15:24:06 +00:00
Tom Christie	8f25c0c53c	Add 1.8 support	2015-01-23 14:56:15 +00:00
Xavier Ordoquy	15f797fd3e	Owned by import *	2015-01-21 19:46:31 +01:00
Xavier Ordoquy	857185cf07	Workaround Django issue 24198.	2015-01-21 19:29:40 +01:00
Tom Christie	9ec08ce578	Merge master	2015-01-21 13:12:14 +00:00
Tom Christie	da6ef3d0b0	Allow missing fields option for inherited serializers. Closes #2388.	2015-01-21 13:03:37 +00:00
Tom Christie	11efde8905	Merge pull request #2373 from jakul/document-translations-3.1 ... Document how to translate DRF error messages (version 3.1)	2015-01-09 11:57:02 +00:00
Craig Blaszczyk	58ec7669ae	swap backticks for double quotes	2015-01-07 18:22:30 +00:00
Craig Blaszczyk	91e316f781	prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings	2015-01-07 12:46:23 +00:00
Craig Blaszczyk	4c32083b8b	use double quotes for user visible strings; end user visible strings in full stops; add some missing translation tags	2015-01-07 12:01:11 +00:00
Tom Christie	949e3b7507	Merge branch 'master' into version-3.1	2015-01-05 15:04:23 +00:00
Tom Christie	6fd33ddea9	Udpate docstring	2015-01-05 15:04:01 +00:00
Tom Christie	49dc037a96	Update docstring	2015-01-05 15:03:09 +00:00
Tom Christie	b6ca7248eb	required=False allows omission of value for output. Closes #2342	2015-01-05 14:32:12 +00:00
Tom Christie	2a1485e009	Final bits of docs for ModelSerializer fields API	2014-12-19 21:32:43 +00:00
Tom Christie	62f78dfbf1	Copy validators lists on instantiation.	2014-12-19 15:50:29 +00:00
Tom Christie	75e81b8254	build_*_field methods	2014-12-19 15:35:52 +00:00
Tom Christie	f72928ea98	build_field, build_final_kwargs	2014-12-19 15:09:57 +00:00
Tom Christie	94883ae7cd	Merge branch 'version-3.1' into model-serializer-api	2014-12-19 14:53:21 +00:00
Tom Christie	80bacc5fb0	depth should reduce by one on each nesting level. Closes #2287.	2014-12-19 14:52:53 +00:00
Tom Christie	4a112fc3a6	Clean up	2014-12-19 14:51:45 +00:00
Tom Christie	caa1318124	get_uniqueness_field_options first pass	2014-12-19 13:13:20 +00:00
Tom Christie	1a84943a00	get_extra_kwargs	2014-12-19 12:27:50 +00:00
Tom Christie	6d907cde9a	get_field_names, get_default_field_names	2014-12-19 12:18:40 +00:00
Tom Christie	ba753a7536	Merge branch 'version-3.1' into model-serializer-api	2014-12-19 11:53:26 +00:00