1755 Commits

Author	SHA1	Message	Date
Joar Leth	b18d773b51	Fix typo in 3.1 announcement	2015-02-09 22:51:49 +01:00
Tom Christie	fbb21caaaa	Merge master	2015-02-09 20:43:50 +00:00
Tom Christie	407480b484	Minor docs work	2015-02-09 17:01:41 +00:00
Tom Christie	670723f021	Minor cleanups/improvements to ModelSerializer API	2015-02-06 15:45:02 +00:00
José Padilla	235b98e427	Merge pull request #2460 from mmarvick/master ... Small fixes to the tutorial	2015-02-06 11:31:25 -04:00
Tom Christie	5d8c3abe72	Fix typo	2015-02-06 15:27:35 +00:00
Tom Christie	a435b1b355	Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1	2015-02-06 14:39:31 +00:00
Tom Christie	1f99612845	Upgrade pending deprecations to deprecations	2015-02-06 13:21:35 +00:00
Tom Christie	1d4956f616	Pagination images	2015-02-06 13:08:04 +00:00
Tom Christie	53716f6152	Internationalization docs	2015-02-06 11:37:29 +00:00
José Padilla	7f801b9a01	Add trim_whitespace to CharField #2517 ... If set to `True` then leading and trailing whitespace is trimmed. Defaults to `True`.	2015-02-06 01:09:19 -04:00
Michael Marvick	5bf803b6ed	Revert some of the changes made in 1-serialization.md	2015-02-05 19:42:36 -08:00
Tom Christie	09488ad4da	Link to ModelSerializer API	2015-02-06 00:25:03 +00:00
Tom Christie	6c63ef13cd	Drop 2.x announcements	2015-02-06 00:04:20 +00:00
Tom Christie	41b213414d	Updating release notes	2015-02-04 23:32:25 +00:00
Xavier Ordoquy	46181341d5	Merge pull request #2512 from heywbj/docs ... Add django-rest-framework-recursive to docs	2015-02-04 00:13:52 +01:00
Warren Jin	76efbdddb6	docs	2015-02-03 17:18:54 -05:00
James Cooke	f676569661	Small documentation fixes ... * Remove "you you" from viewsets API-guide * Fix link from routers API-guide to viewsets API-guide	2015-02-03 13:43:03 +00:00
Tom Christie	d015534d53	Fleshing out 3.1 announcement	2015-02-03 09:15:42 +00:00
Tom Christie	6e2ea852d0	Merge pull request #2498 from dustinfarris/update-eda-link ... Update link for ember-django-adapter	2015-02-01 21:17:36 +00:00
Dustin Farris	2111a99b32	Update link for ember-django-adapter	2015-02-01 16:00:24 -05:00
José Padilla	9437d9b8ee	Fix base_template name in example	2015-02-01 16:18:40 -04:00
José Padilla	aaa1fcd5d1	Fixes #2493	2015-02-01 16:18:02 -04:00
Tom Christie	2cc4cb2465	Fix error text in test.	2015-01-31 08:53:40 +00:00
Tom Christie	0d96cf2ca2	Latest translation source messages.	2015-01-30 16:27:49 +00:00
Tom Christie	4ee4b4f2dc	Merge master	2015-01-30 14:00:25 +00:00
Tom Christie	7cf9dea7f9	Docs typo. Closes #2491.	2015-01-30 11:00:29 +00:00
Tymur Maryokhin	e720927b78	Removed deprecated '.model' docs	2015-01-29 17:28:18 +01:00
mareknaskret	4a2a36ef82	Update filtering.md ... Updated links for django-guardian package.	2015-01-28 15:17:56 +01:00
Xavier Ordoquy	0daf160946	Fix #2476	2015-01-28 00:06:34 +01:00
Xavier Ordoquy	925ea4bdc6	Release notes for 3.0.4	2015-01-27 19:43:38 +01:00
Tom Christie	fc70c0862f	Galileo Press -> Rheinwerk Verlag	2015-01-26 14:07:21 +00:00
Michael Marvick	73bd0d539f	tutorial #5 incorrectly referenced 'settings.py' instead of 'tutorial/settings.py'	2015-01-25 23:47:01 -08:00
Michael Marvick	2a6937f381	tutorial #2 incorrectly showed /item.json instead of /item/.json for format suffixes	2015-01-25 23:46:27 -08:00
Michael Marvick	90c9968a70	tutorial #1 incorrectly showed string of json instead of ReturnDict type from 'serializer.data', and also has a third item in the second usage	2015-01-25 23:45:56 -08:00
Jeff Fein-Worton	0a65913fea	typo in fields.md	2015-01-24 18:34:16 -08:00
Jeff Fein-Worton	39da9c7c86	minor typo in viewsets docs	2015-01-24 12:53:21 -08:00
Tom Christie	8f6d7f4a5a	Merge pull request #2451 from tomchristie/dict-field ... Added DictField and support for HStoreField.	2015-01-23 16:33:37 +00:00
Tom Christie	35f6a82462	Added DictField and support for HStoreField.	2015-01-23 16:27:23 +00:00
Tom Christie	b07d931261	Merge pull request #2448 from tomchristie/uuid-field ... Added UUIDField.	2015-01-23 15:43:21 +00:00
Tom Christie	5bb348605e	UUIDField docs	2015-01-23 15:31:08 +00:00
Tom Christie	39f26c9eca	Merge master	2015-01-23 14:28:59 +00:00
Carlton Gibson	790c92d438	Update Django-Filter references in docs and requirements.	2015-01-23 15:22:20 +01:00
Duncan Maitland	6e471ad8f4	fix link to Django CSRF docs	2015-01-22 18:29:20 +11:00
Tom Christie	9ec08ce578	Merge master	2015-01-21 13:12:14 +00:00
soooooot	3ca8f85a5b	correcting unclosed quote in routers.md ... correcting unclosed quote in routers.md	2015-01-20 22:24:58 +08:00
Eric Theise	b0bc79ed4d	correcting "it's" to "its" in Tutorial 1	2015-01-19 14:49:36 -08:00
Tom Christie	6065cdbd93	Merge master	2015-01-19 15:16:57 +00:00
Tom Christie	53edd37df5	Tests for LimitOffsetPagination	2015-01-15 21:07:05 +00:00
Tom Christie	313aa727e3	Tweaks	2015-01-14 17:46:41 +00:00