322 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	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	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	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	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	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	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	b65b065375	Add DjangoModelPermissionsOrAnonReadOnly	2013-04-30 14:34:28 +01:00
Tom Christie	21ae3a6691	Drop out attribute	2013-04-30 08:24:33 +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	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	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
Tom Christie	835d3f89d3	Merge remove-django-generics	2013-04-23 11:59:13 +01:00
Mark Aaron Shirley	c7e000e46e	Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer ... Conflicts: docs/api-guide/serializers.md	2013-04-16 09:55:47 -07:00
Stephan Groß	ad436d966f	Add DecimalField support	2013-04-15 13:02:18 +02:00
Tom Christie	d75cebf756	Remove router bit from viewset docs	2013-04-11 15:48:41 +01:00
Victor Shih	b73dfb9cc1	Remove redundant text.	2013-04-11 01:48:25 -07:00
Mark Aaron Shirley	bda25479aa	Update docs with allow_add_remove	2013-04-10 08:44:54 -07:00
Tom Christie	027792c981	Viewsets and routers in seperate docs	2013-04-09 11:54:51 +01:00
Tom Christie	371698331c	Tweaks	2013-04-04 22:24:30 +01:00
Tom Christie	c785628300	Fleshing out viewsets/routers	2013-04-04 20:00:44 +01:00
Tom Christie	64bcbb34d4	Merge pull request #769 from vshih/master ... Spelling/grammar fixes.	2013-03-31 05:34:13 -07:00
Tom Christie	ec076a0078	Add viewsets/routers to indexs etc	2013-03-31 11:36:58 +01:00
Victor Shih	33ce7dfac4	Spelling/grammar fixes.	2013-03-30 20:28:27 -07:00
Tom Christie	399ac70b83	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2013-03-30 15:40:11 +00:00
Tom Christie	d243538547	Note on using curl with token auth	2013-03-28 14:54:42 +00:00
Fernando Rocha	b2cea84fae	Complete remove of client checks from oauth2 ... Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>	2013-03-27 19:00:36 -03:00
Tom Christie	92c929094c	Version 2.2.5	2013-03-26 07:48:53 +00:00
Tom Christie	8387cb5d16	Docs fix	2013-03-25 20:28:17 +00:00
Tom Christie	7eefcf7e53	Bulk update, allow_add_remove flag	2013-03-25 20:26:34 +00:00
Tom Christie	870d5c7d78	Merge pull request #744 from tomchristie/basic-bulk-edit ... Basic bulk create and bulk update	2013-03-22 14:47:29 -07:00
Tom Christie	13794baf70	Bit of extra tidying and plenty of docs	2013-03-22 17:01:06 +00:00