20 Commits

Author	SHA1	Message	Date
Xavier Ordoquy	2489e38a06	Merge remote-tracking branch 'origin/master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini	2014-06-23 14:02:45 +02:00
Sylvain Bellemare	e033a0b9a0	Replaced singular "is" by plural "are"	2014-05-06 15:08:53 +02:00
Sylvain Bellemare	beb7253a96	Removed unnecessary "that"	2014-05-06 15:08:53 +02:00
Sylvain Bellemare	9dc5e15e5a	Added missing "the" word	2014-05-06 15:08:53 +02:00
Tom Christie	21cd638659	Merge master	2013-09-25 09:44:26 +01:00
tom-leys	85ab879a85	Updated tutorial part 6: 2 examples were missing includes	2013-08-31 19:40:53 +12:00
Tom Christie	c607414f16	Merge	2013-08-19 20:36:18 +01:00
martync	770d496307	Small typo	2013-08-13 09:19:40 +02:00
Alex Burgel	eaae8fb2d9	Combined link_* and action_* decorators into detail_route and list_route, marked the originals as deprecated.	2013-07-15 18:35:13 -04:00
Tom Christie	777ecb5141	Add renderer_classes kwarg when binding snippet_highlight explicitly. Closes #923	2013-06-10 09:05:44 +01:00
Areski Belaid	ffdf633aa5	Fix on documentation - wrong reference at previous created view UserList / UserDetail	2013-06-05 14:19:36 +02:00
Andrew Tarzwell	62c7326b77	Update Typo	2013-05-20 17:43:37 -03:00
Tom Christie	6fcffcc9c6	Typo	2013-05-20 14:02:19 +01:00
Tom Christie	fd84cf7f10	Docs tweaks	2013-05-10 21:56:33 +01:00
Tom Christie	74beaefd12	Simplifying bits of docs	2013-05-02 12:08:05 +01:00
Tom Christie	8fa79a7fd3	Deal with List/Instance suffixes for viewsets	2013-04-26 14:59:21 +01:00
Tom Christie	b94da2468c	Various clean up and lots of docs	2013-04-24 22:40:24 +01:00
Tom Christie	371698331c	Tweaks	2013-04-04 22:24:30 +01:00
Tom Christie	fb41d2ac8f	Add support for action and link routing	2013-04-04 20:35:40 +01:00
Tom Christie	ec076a0078	Add viewsets/routers to indexs etc	2013-03-31 11:36:58 +01:00