1209 Commits

Author	SHA1	Message	Date
Yuri Prezument	6e622d644c	CharField - add allow_null argument	2014-01-12 10:53:54 +02:00
Tom Christie	52686420f4	Merge branch 'bennbollay-patch-1' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini	2013-12-23 09:48:59 +00:00
Tom Christie	d8a95b4b6d	Back out permissions example change in favor of easier to follow example	2013-12-23 09:12:34 +00:00
amatellanes	2846ddb5d2	Simplified some examples in tutorial	2013-12-23 09:06:03 +01:00
amatellanes	74f1cf6355	Revert "Simplified some examples in tutorial" ... This reverts commit d6806340e5.	2013-12-23 08:56:34 +01:00
amatellanes	d6806340e5	Simplified some examples in tutorial	2013-12-23 08:50:46 +01:00
Tom Christie	bc0e994784	Added example of using APIException class. Closes #1300	2013-12-21 21:10:05 +00:00
Tom Christie	1f3ded4559	Docs tweaks	2013-12-21 17:18:25 +00:00
Vitaly Babiy	22343ee117	Added links to djangorestframework-camel-case in the third party ... sections of the docs for both parsers and renderers.	2013-12-21 07:07:06 -05:00
Tom Christie	02ae1682b5	Add note on compat import in tutorial	2013-12-17 09:45:28 +00:00
Xavier Ordoquy	8026480454	Use the BytesIO for buffering bytes and import the one from the compat module.	2013-12-17 10:30:23 +01:00
Tom Christie	31dd160256	Typo	2013-12-16 11:59:14 +00:00
Tom Christie	6b6b255684	Add note on pagination bugfix. Closes #1293.	2013-12-14 20:42:58 +00:00
Tom Christie	f78b3187df	Added @philipforget for work on #1232. Thanks :)	2013-12-13 22:01:19 +00:00
Tom Christie	54d3c6a725	Updated release notes	2013-12-13 21:59:47 +00:00
Tom Christie	39dbea4da4	Links to drf-nested-routers	2013-12-13 20:27:17 +00:00
Tom Christie	87b99d1ac8	Update release notes	2013-12-13 20:17:26 +00:00
Tom Christie	9c41c007af	Merge branch 'master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py	2013-12-13 16:32:34 +00:00
Tom Christie	ca244ad614	Expanded notes in quickstart. Closes #1127. Closes #1128.	2013-12-13 15:30:59 +00:00
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	ed931b90ae	Further docs tweaks	2013-12-13 00:11:59 +00:00
Tom Christie	83da4949c0	Allow NUM_PROXIES=0 and include more docs	2013-12-13 00:02:18 +00: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
kahnjw	887da7f6c5	Add missing tick marks	2013-12-06 14:30:33 -08:00
kahnjw	196c5952e4	Fix typo	2013-12-06 14:24:16 -08:00
kahnjw	100a933279	Add documentation to explain what effect these changes have.	2013-12-06 14:22:08 -08: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