4784 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	2123685453	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2014-12-02 15:15:33 +00:00
Tom Christie	33096a1de6	BindingDict inherits from collections.MutableMapping. Closes #2135.	2014-12-02 15:15:21 +00:00
Tom Christie	e335ad4a04	Merge pull request #2181 from daaray/patch-2 ... Fix typo in serializers doc	2014-12-02 14:48:49 +00:00
David Ray	84cff98fbf	fix typo	2014-12-02 09:46:43 -05:00
Tom Christie	0359e9250d	FileUploadParser. Raising StopFutureHandlers removes any handlers not yet run for the active set. Closes #2109.	2014-12-02 13:52:46 +00:00
Tom Christie	e30e3f6dfc	Update README with 3.0 info.	2014-12-02 13:14:11 +00:00
Tom Christie	41045c1c23	Merge branch 'gregmuellegger-fixes/2013'	2014-12-02 13:05:09 +00:00
Tom Christie	76ac641fbd	Minor tweaks for helpful message on Model.objects.create() failure.	2014-12-02 13:04:49 +00:00
Tom Christie	54b7b32818	Merge branch 'fixes/2013' of git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013	2014-12-02 12:46:47 +00:00
phalt	515060a6ab	Only show pip install for httpie	2014-12-02 10:16:41 +00:00
Tom Christie	79e18a2a06	Raise assertion error if calling .save() on a serializer with errors. Closes #2098.	2014-12-02 09:27:40 +00:00
Tom Christie	6ac79b8223	Document Field.fail(). Closes #2147.	2014-12-02 09:19:59 +00:00
BrickXu	53f52765fc	Not allow to pass an empty actions to viewset.as_view(). Refs issue #2171	2014-12-02 17:07:55 +08:00
Tom Christie	f4fc4670ca	Promote 'many_init' to public API. Closes #2152.	2014-12-02 08:53:36 +00:00
Tom Christie	deec61e0d6	Merge pull request #2173 from jpadilla/master ... Consolidate Django and test requirements	2014-12-02 08:32:28 +00:00
Tom Christie	d847e336c5	Merge pull request #2161 from NextHub/master ... Move models to respective test modules	2014-12-02 08:29:22 +00:00
BrickXu	81870b6e1a	Merge pull request #2 from tomchristie/master ... Merge upstream	2014-12-02 12:52:36 +08:00
Tymur Maryokhin	0a91999d6a	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2014-12-02 01:50:17 +01:00
José Padilla	bc0c25df30	Consolidate Django and test requirements	2014-12-01 17:31:11 -04:00
Tom Christie	d1fe61ce94	Fix requirements. Closes #2170.	2014-12-01 17:05:11 +00:00
Xavier Ordoquy	7b8699ac70	Merge pull request #2167 from jpadilla/patch-1 ... Change allow_none to allow_null in 3.0 announcement	2014-12-01 16:30:01 +01:00
José Padilla	080fa4f5f8	Change allow_none to allow_null	2014-12-01 11:26:50 -04:00
Tom Christie	555c450497	Add missing 'validators.py' link. Closes #2166.	2014-12-01 14:46:47 +00:00
phalt	34b5db62e5	Use httpie for tutorials	2014-12-01 13:39:53 +00:00
Tom Christie	1caa14dd14	Minor 3.0 announcment tweaks	2014-12-01 12:22:21 +00:00
Tom Christie	270c7acdd7	Minor validtors tweak	2014-12-01 11:59:04 +00:00
Tom Christie	22c5b863bc	More descriptive docstring on ModelSerializer	2014-12-01 11:37:38 +00:00
Tom Christie	b9503cd603	Support Django's core ValidationError for backwards compat. Refs #2145.	2014-12-01 10:48:45 +00:00
Carlton Gibson	ef26f43de4	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2014-12-01 11:22:39 +01:00
Tom Christie	72c4ec4e18	Add 3.0 announcement	2014-12-01 08:54:12 +00:00
Tymur Maryokhin	e2ea98e8ab	Fixed typos	2014-11-29 20:23:55 +01:00
Tymur Maryokhin	dd9d40d8c0	Moved non-conflicting models	2014-11-29 20:04:50 +01:00
Tymur Maryokhin	2f03483f96	Removed unused models	2014-11-29 19:45:26 +01:00
Tom Christie	caf1de3b88	Minor tweaks to contributing docs	2014-11-28 16:06:44 +00:00
Tom Christie	08c727add3	@api_view defaults to allowing GET	2014-11-28 15:55:02 +00: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