842 Commits

Author	SHA1	Message	Date
Mark Aaron Shirley	e550740b3d	Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer ... Conflicts: rest_framework/tests/relations_nested.py	2013-05-08 22:39:48 -07:00
Tom Christie	4ab7b8f257	Version 2.3.2	2013-05-08 20:49:49 +01:00
Tom Christie	b443560080	Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798	2013-05-08 20:38:50 +01:00
Tom Christie	9d59e55cec	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2013-05-08 20:09:03 +01:00
Tom Christie	2379014f15	Add rails in credits section	2013-05-08 20:08:35 +01:00
Tom Christie	429e078eee	Allow None filename on uploaded files	2013-05-08 20:07:51 +01:00
Tom Christie	673a7a496f	Update generic-views.md	2013-05-08 10:17:27 +02:00
Tom Christie	42ba5b425b	Added @dhepper for typo fixes in #812.	2013-05-08 10:02:52 +02:00
Daniel Hepper	70b8e5b759	Fixed typos in tutorial	2013-05-07 19:16:03 +02:00
Tom Christie	a758066c03	Added @eyepulp for fix #810	2013-05-07 17:25:51 +01:00
Tom Christie	a8e090df04	Remove accidental conflict diff	2013-05-07 17:14:25 +01:00
Tom Christie	d7c08222f1	Fix breadcrumb rendering issue	2013-05-07 14:11:48 +01:00
Tom Christie	ed2cf180c9	Version 2.3.0	2013-05-07 13:29:38 +01:00
Tom Christie	3353889ae8	Docs for FileUploadParser	2013-05-07 13:27:27 +01:00
Tom Christie	642970a1b8	Merge pull request #806 from wronglink/master ... Added FileUploadParser	2013-05-07 05:09:09 -07:00
Tom Christie	0f00da848d	Tweak 2.3 release notes	2013-05-07 13:07:42 +01:00
Tom Christie	3c2bb06660	Support for multiple filter classes	2013-05-07 13:00:44 +01:00
Tom Christie	d71a5533f9	allow_empty -> pending deprecation in preference of overridden get_queryset.	2013-05-07 12:25:41 +01:00
Tom Christie	b70c9cc107	Merge master	2013-05-05 18:12:35 +01:00
Tom Christie	2dfd8c9697	docs, docs, docs	2013-05-05 16:48:12 +01:00
Michael Elovskikh	5faaba9c69	Docs for FileUploadParser	2013-05-04 18:04:48 +06:00
Tom Christie	2d44dc3f54	Update release notes	2013-05-02 12:46:10 +01:00
Tom Christie	74beaefd12	Simplifying bits of docs	2013-05-02 12:08:05 +01:00
Victor Shih	8cabae22c5	Example and spelling fixes. Change "browseable" to "browsable" for consistency.	2013-05-01 21:26:40 -07:00
Tom Christie	ddbbe7844b	Document lookup_field in release notes	2013-05-01 09:10:49 +01:00
Tom Christie	35f99cddc4	lookup_field on hyperlinked fields, and overriddable hyperlinked fields. Closes #688	2013-05-01 09:03:09 +01:00
Tom Christie	22af28d146	Merge master	2013-04-30 19:32:34 +01:00
Tom Christie	7eba12fd28	More index docs tweaks	2013-04-30 14:34:42 +01:00
Tom Christie	b65b065375	Add DjangoModelPermissionsOrAnonReadOnly	2013-04-30 14:34:28 +01:00
Tom Christie	455d7cca1e	More tweaking of index/readme	2013-04-30 09:38:04 +01:00
Tom Christie	ac766346a4	Docs tweaks	2013-04-30 08:33:33 +01:00
Tom Christie	21ae3a6691	Drop out attribute	2013-04-30 08:24:33 +01:00
Tom Christie	81c3b4f250	Updated release notes	2013-04-29 17:32:32 +01:00
Tom Christie	0c1ab584d3	Tweaks for preferring .queryset over .model	2013-04-29 14:08:38 +01:00
Tom Christie	53f9d4a380	fields shortcut on views	2013-04-29 13:20:15 +01:00
Tom Christie	d17e2d852f	Remove AutoRouter. (Adding shortcut to generic views/viewsets means it's unneccessary)	2013-04-29 12:46:57 +01:00
Tom Christie	70831ad0bb	Docs tweaks	2013-04-29 12:08:21 +01:00
Tom Christie	5d357a9b08	Added @chenjyw for depth bugfix #802. Thanks!	2013-04-29 10:28:51 +02:00
Tom Christie	33a26a76f1	Typo	2013-04-27 16:35:42 +02:00
Tom Christie	73019f91fe	Update docs on object-level permissions. ... Closes #801.	2013-04-27 14:29:32 +02:00
Tom Christie	8fa79a7fd3	Deal with List/Instance suffixes for viewsets	2013-04-26 14:59:21 +01:00
Tom Christie	e301e2d974	Adding 'view or viewset' to docs appropriate.	2013-04-26 14:03:26 +01:00
Tom Christie	d985aec3c9	DecimalField	2013-04-26 13:59:06 +01:00
Tom Christie	50c6bc5762	Fix up viewset docs slightly	2013-04-26 13:31:19 +01:00
Tom Christie	51f80c3604	Fix broken queryset in example	2013-04-26 10:23:05 +01:00
Tom Christie	74b3307978	Docs, docs, docs	2013-04-25 20:43:37 +01:00
Tom Christie	9abaf77401	More viewset/router docs	2013-04-25 17:39:33 +01:00
Tom Christie	b14b584989	Remove 2.0 migration guide which was never included	2013-04-25 12:48:01 +01:00
Tom Christie	95abe6e844	Cleanup docstrings	2013-04-25 12:47:34 +01:00
Tom Christie	b94da2468c	Various clean up and lots of docs	2013-04-24 22:40:24 +01:00