Commit Graph

4656 Commits

Author SHA1 Message Date
Tom Christie
3d6620c72a Merge 2014-12-03 23:24:06 +00:00
Tom Christie
cd4d866021 Merge branch 'jpadilla-jsonp' into version-3.1 2014-12-03 23:15:06 +00:00
Tom Christie
f74e52b31e Merge 2014-12-03 23:14:58 +00:00
Tom Christie
6369f92125 Merge 2014-12-03 23:12:52 +00:00
Tom Christie
af23ec36bb Merge branch 'jpadilla-oauth_as_package' into version-3.1 2014-12-03 23:11:04 +00:00
Tom Christie
9680329cb0 Merge pull request #2160 from jpadilla/xml
Remove XML support from core
2014-12-03 23:08:42 +00:00
José Padilla
7f9dc73672 Remove XML support from core 2014-11-29 14:57:51 -04:00
José Padilla
fe745b9616 Remove JSONP support from core 2014-11-29 14:55:33 -04:00
José Padilla
731c8421af Remove YAML support from core 2014-11-29 14:43:05 -04:00
José Padilla
0cc990792c Merge branch 'version-3.1' into oauth_as_package
Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini
2014-11-28 12:14:40 -04:00
Tom Christie
3a5b3772fe Use ImproperlyConfigured when model meta lookup fails 2014-11-28 15:36:04 +00:00
Tom Christie
6fbd23ab34 Merge pull request #2086 from beck/doug/blow-up-with-bad-models
Ensure _resolve_model does not return None
2014-11-28 15:31:51 +00:00
Tom Christie
8d989bb16d Merge pull request #2143 from linovia/bugfix/1850
Bugfix for #1850
2014-11-28 15:01:56 +00:00
Tom Christie
9ba29a88d6 Finalizing 3.0 release notes 2014-11-28 14:43:33 +00:00
Tom Christie
8e549a76ea Add 2.x notes and links 2014-11-28 14:26:03 +00:00
Carlton Gibson
a741418f50 Merge pull request #2153 from maryokhin/patch-1
Update token auth view. Closes #2151.
2014-11-28 14:24:19 +01:00
Tom Christie
66b3daebbd Docs. Sponsor call-out. 2014-11-28 13:14:47 +00:00
Tom Christie
c8764de788 Drop defunct tests 2014-11-28 13:04:42 +00:00
Tom Christie
d84582fe1f Add 'built with MkDocs' footer 2014-11-28 12:55:08 +00:00
Tom Christie
9e03b0843a Drop google_analytics config since it's in the base template anyways. 2014-11-28 12:53:59 +00:00
Tom Christie
05a86e3d65 Docs. Minor tweaks. 2014-11-28 12:51:44 +00:00
Tymur Maryokhin
d9a09f7826 Removed unused import 2014-11-28 13:33:07 +01:00
Tymur Maryokhin
0539b1be01 Update token auth view. Closes #2151. 2014-11-28 12:27:05 +01:00
Tom Christie
276a2a52ee Docs on nested creates/updates and suchlike 2014-11-28 11:26:35 +00:00
Tom Christie
d4b8e356b9 Merge branch '3.0-docs' 2014-11-28 09:57:02 +00:00
Tom Christie
34ca8cd2a5 Moar docs. Amazing. 2014-11-28 09:56:44 +00:00
Tom Christie
c61c59f8b7 Notes on removal of Field.validate() and Serializer.transform_<field_name> 2014-11-27 17:01:46 +00:00
Tom Christie
d2d7e1dfde Drop Field.validate 2014-11-27 16:41:53 +00:00
Tom Christie
6b2033f789 Drop transform_<field_name> 2014-11-27 16:40:58 +00:00
Tom Christie
a88a37a8ce Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-27 15:14:25 +00:00
Tom Christie
8579222cbd Fix for nested attribute lookups where one is a callable 2014-11-27 15:14:11 +00:00
Tom Christie
b73cc71666 Merge pull request #2149 from jpadilla/master
Update to latest minor Django versions
2014-11-27 14:00:30 +00:00
José Padilla
fceeecf1e2 Update to latest minor Django versions 2014-11-27 09:06:37 -04:00
Tom Christie
2fe6709769 Fix sponsor images for mkdocs 2014-11-27 11:00:57 +00:00
Tom Christie
5a33adc032 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-27 08:11:03 +00:00
Tom Christie
1ffe4857ec Support callable attributes in dotted source. Closes #2142. 2014-11-27 08:10:52 +00:00
Tom Christie
0262262fee 3.0 serializer docs 2014-11-27 08:09:58 +00:00
Tom Christie
5155aa4d28 Merge pull request #2144 from jpadilla/patch-2
Remove Third party packages section
2014-11-27 08:07:49 +00:00
José Padilla
9b88c096e0 Remove Third party packages section
Information about Third party packages is already covered under the Third Party Resources topic
2014-11-26 18:12:12 -04:00
Xavier Ordoquy
767414439b Be nicer with __closable_objects. 2014-11-26 22:20:14 +01:00
Tom Christie
f203c75ede Merge pull request #2141 from willstott101/once-one
tutorial typo fix
2014-11-26 19:28:24 +00:00
Will Stott
d0e245baba grammar 2014-11-26 15:51:28 +00:00
Will Stott
34bd2b7828 a few typos 2014-11-26 15:48:08 +00:00
Xavier Ordoquy
f5e5ed0077 Merge remote-tracking branch 'reference/master' into bugfix/1850 2014-11-26 16:36:56 +01:00
Tom Christie
786cab705a Tweak to 3.0 relationship docs 2014-11-26 11:38:48 +00:00
Tom Christie
5a5a73c7fe 3.0 docs and tidy-up for serializer relationships 2014-11-26 11:30:49 +00:00
Tom Christie
b4550c65dd Docstring for 'many_init' 2014-11-26 11:30:28 +00:00
Tom Christie
678f7b4c65 Update notes on autocomplete 2014-11-26 10:43:45 +00:00
Tom Christie
e1b14cbe4a 3.0 docs for serializer fields 2014-11-26 10:27:29 +00:00
Tom Christie
0f5338ada9 Call out removal of pre_save/post_save more strongly 2014-11-26 09:06:15 +00:00