1173 Commits

Author	SHA1	Message	Date
Tom Christie	7e7336db91	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework ... Conflicts: docs/api-guide/routers.md	2013-12-13 09:04:54 +00:00
S. Andrew Sheppard	73e8536e0d	third-party package: wq.db	2013-12-12 21:45:44 -06:00
Tom Christie	df2d9034c2	Add third party packages	2013-12-12 23:10:31 +00:00
OddBloke	4f473f0b9e	Use get_user_model instead of User in Generating Tokens example ... Because that's a better way of doing it.	2013-12-11 13:56:56 +00:00
OddBloke	5acefd3b17	Add full required imports to Generating Tokens example ... Previously we were missing User and post_save.	2013-12-11 13:55:54 +00:00
David Ray	7382f8c6ad	Update routers.md ... Reference to ```DefaultRouter``` should be ```SimpleRouter```	2013-12-10 14:56:07 -05:00
Tom Christie	c09ad1bedc	Remove incorrect apostrophe	2013-12-10 08:53:38 +00:00
Tom Christie	40164fcc62	Update release notes	2013-12-10 08:49:54 +00:00
Tom Christie	785a42cd5a	Tweak REST condition text.	2013-12-10 08:38:43 +00:00
Maxim Kamenkov	9ba7be959c	Added REST Condition to 3rd party permissions packages list.	2013-12-09 20:33:06 +02:00
Tom Christie	b599447b71	Merge pull request #1277 from Ian-Foote/master ... Fix typo "Not" -> "Note"	2013-12-09 01:54:37 -08:00
Ian	de319f3e28	Fix typo "Not" -> "Note"	2013-12-09 09:53:16 +00:00
Tom Christie	2c898bd901	Update release notes	2013-12-09 09:27:10 +00:00
Tom Christie	c1be503308	Add notes to contributing docs	2013-12-09 08:46:18 +00:00
Tom Christie	e6f6bb5c7e	Add notes to contributing docs	2013-12-09 08:42:09 +00:00
Tom Christie	23369650e3	Add notes to contributing docs	2013-12-09 08:14:21 +00:00
Tom Christie	e80b353085	Add notes to contributing docs	2013-12-09 08:10:51 +00:00
Tom Christie	5eca31d161	Merge pull request #1275 from qooleot/master ... RelatedField is function of serializer class	2013-12-08 23:46:55 -08:00
Rustam Lalkaka	b8732d2165	Minor grammar fix -- 'team' is singular	2013-12-08 19:34:24 -05:00
taras	3399158d62	RelatedField is function of serializer class	2013-12-08 11:40:40 -05:00
Andy Wilson	db19fba50d	update installation example to work with django 1.6 ... looks like django.conf.urls.defaults was deprecated as of django 1.6	2013-12-06 22:31:07 -06:00
Tom Christie	910de38a9c	Version 2.3.10	2013-12-06 22:13:50 +00:00
Tom Christie	85d9eb0f7e	Update release-notes.md	2013-12-06 21:47:26 +00:00
Tom Christie	51359e4612	Added @chuckharmston for kickass bug squashing in #1272	2013-12-06 21:42:52 +00:00
Tom Christie	f8088bedef	Upgrade JSONP security warning.	2013-12-05 09:01:00 +00:00
Drew Kowalik	f2682537e0	fix broken documentation links	2013-12-04 16:10:05 -08:00
Tom Christie	6446b44f01	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2013-12-04 14:59:28 +00:00
Tom Christie	de5b9e39dd	First pass on contribution guide	2013-12-04 14:59:09 +00:00
Tom Christie	04a43ddca5	Merge pull request #1267 from tomchristie/fix-1133 ... Clarify wording, fixes #1133.	2013-12-04 00:52:07 -08:00
Tom Christie	3c3906e278	Clarify wording, fixes #1133.	2013-12-04 08:51:34 +00:00
Tom Christie	38d78b21c0	Remove Content-Type header from empty responses. Fixes #1196	2013-12-03 16:55:11 +00:00
Tom Christie	9f1918e41e	Added @ian-foote, for work on #1250. Thanks!	2013-12-03 16:06:57 +00:00
Tom Christie	b92c911cf6	Update release-notes.md	2013-12-03 16:05:19 +00:00
Tom Christie	fe4c7d4000	Update release-notes.md	2013-12-03 08:26:58 +00:00
Pablo Recio	699ec7236b	Adds pre_delete and post_delete hooks on	2013-12-03 00:07:41 +00:00
Stephan Groß	850cd83ba7	Fix TemplateHTMLRenderer example	2013-12-02 11:44:04 +01:00
Omer Katz	c46106c961	Rephrased documentation changes according to feedback on IRC.	2013-11-27 14:47:37 +02:00
Omer Katz	2dce8d7a8a	Recommend using Pillow instead of PIL.	2013-11-27 13:23:49 +02:00
Tom Christie	3765865b4b	Update 'default' explanation. Closes #1239	2013-11-20 17:40:56 +00:00
Tom Christie	304b193efe	Update release-notes.md	2013-11-19 15:58:34 +00:00
Tom Christie	ca2bd616d9	Remove a couple of .html suffixes in docs	2013-11-19 11:01:27 +00:00
Tom Christie	bc69a6d983	Add a 404 page to the docs	2013-11-18 16:10:26 +00:00
Tom Christie	20325cce18	Drop .html suffixes in docs	2013-11-18 16:10:14 +00:00
Tom Christie	075b8c1037	Add User import. Refs #599	2013-11-18 09:29:09 +00:00
Tom Christie	128bda5712	Use less specfic language in UltaJSON notes	2013-11-15 15:24:32 +00:00
Tom Christie	1d1b2f765c	Version 2.3.9	2013-11-15 13:55:02 +00:00
Alex	72d72e4d3e	Add Alex Good to credits (Whoop!)	2013-11-13 14:32:37 +00:00
Jacob Haslehurst	52ac2199a8	Added drf-ujson-renderer to renderers docs ... drf-ujson-renderer is a third party renderer that implements JSON renderering using UltraJSON	2013-11-11 22:24:37 +11:00
Doğan Çeçen	fd2c291c4d	Typo on api-guide/fields.md and serializers.py	2013-11-11 11:54:30 +02:00
Tom Christie	003b9dda34	Merge pull request #1207 from erkarl/master ... Updated OAuth2 authentication docs.	2013-11-02 02:24:08 -07:00