311 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	0a7ac40a0d	Merge hg-git ickyness	2011-07-01 16:06:20 +01:00
Tom Christie	c4fe5a920b	Urg, force update after hg-git ickyness	2011-07-01 16:05:22 +01:00
Tom Christie	4136454b95	Try to force README.rst to rename	2011-07-01 15:55:33 +01:00
Tom Christie	601430c293	Try to force README.rst to rename ... --HG-- rename : README.rst => README	2011-07-01 15:54:24 +01:00
Tom Christie	e46a83b19c	Try to for README to rename	2011-07-01 15:52:54 +01:00
Tom Christie	605ece1ae3	Tweak	2011-07-01 13:25:59 +01:00
Tom Christie	bcc09998dd	Tweak	2011-07-01 13:19:26 +01:00
Tom Christie	630785f5a9	Markup the README ... --HG-- rename : README => README.rst	2011-07-01 13:17:59 +01:00
Tom Christie	8d51759dd1	Fix bitbucket issue 39. All further issues should be on github	2011-07-01 12:29:42 +01:00
Tom Christie	2ebcc9d3dd	Mmm, unconvinced if this whole hg-git thing is a good plan...	2011-07-01 11:36:15 +01:00
GitHub Merge Button	892e4eea98	Merge 60cd5363ab into 16d8c3255d	2011-07-01 03:34:10 -07:00
Tom Christie	ca4b7560cb	merge	2011-07-01 11:31:04 +01:00
Tom Christie	16d8c3255d	Fix #36	2011-07-01 03:30:28 -07:00
GitHub Merge Button	dc9960f770	Merge 60cd5363ab into 8bafa01abd	2011-07-01 00:25:37 -07:00
Fernando Zunino	60cd5363ab	FIX: ModelViews can have Resources whose models have unique fields. ... ReadModelMixin and UpdateModelMixin store model instance as a property. This allows ModelResource to bind the ModelForm using the model instance making the form validate the input data against the model instance and not a brand new instance. When the latter happened and the model used unique fields, the form validation failed whenever a PUT was maintaining the previuos value of the unique field.	2011-07-01 03:32:04 -03:00
Tom Christie	8bafa01abd	Tidy up oauth imports slightly	2011-06-30 08:52:55 +01:00
Tom Christie	5d61ff3508	Merge ickyness	2011-06-30 08:50:23 +01:00
Tom Christie	1e8721a5a0	Urg	2011-06-30 08:49:54 +01:00
Tom Christie	1d35c7fc4c	Ug	2011-06-30 08:48:07 +01:00
Tom Christie	5e2237149d	Fixing merge mess of hg-git ickyness.	2011-06-30 08:47:48 +01:00
Tom Christie	a1555cfd99	Add astraw to AUTHORS	2011-06-30 08:46:28 +01:00
Tom Christie	93e95bac8d	merge from astraw	2011-06-30 08:41:51 +01:00
Tom Christie	019cb7f7d7	Merge pull request #33 from astraw/master ... bugfix for failed multipart parse on empty request	2011-06-29 14:31:30 -07:00
GitHub Merge Button	7ff22fa94f	Merge f6e4578656 into d714901a60	2011-06-29 14:29:03 -07:00
Andrew Straw	f6e4578656	return 400 BAD REQUEST rather than Django traceback/500 error on failed multipart parse	2011-06-29 23:02:00 +02:00
Tom Christie	e5e019b0b3	Pull in David's initial oauth tests	2011-06-28 08:53:53 +01:00
Tom Christie	d714901a60	Remove erronous traceback	2011-06-27 10:30:00 +01:00
Michael Fötsch	d8bec115ad	Allow .json .html .xml style urls and also allow these formats to be specified in a "?format=..." query string.	2011-06-26 16:03:36 +02:00
David Larlet	fe7e3ba3ae	Adding tests for OAuth authentication through django-oauth-plus, a dedicated example project is still missing though	2011-06-25 18:42:03 +02:00
Tom Christie	d3024ff181	Try to be marginally less awful if we can't reverse resolve the URL for a model. TODO: Give up on even trying to do such black magic in the first place?	2011-06-25 17:13:32 +01:00
Tom Christie	14586916e2	Urg. Fixed bug in assigning headers	2011-06-25 16:13:58 +01:00
Tom Christie	d2b5ea107e	Typo in url	2011-06-25 14:58:26 +01:00
Tom Christie	d3557bdcd0	Allow HEAD method	2011-06-25 14:53:48 +01:00
Carles Barrobés	0626b618ad	Support for HEAD method	2011-06-25 12:35:17 +02:00
Tom Christie	50efa10652	Add version to html	2011-06-25 10:25:26 +01:00
Tom Christie	409ee533fd	merge markos throttling example	2011-06-21 23:05:23 +01:00
Tom Christie	82de0cf50a	Decimals are a protected_type - let's leave them up to the renderer to deal with	2011-06-21 23:01:41 +01:00
markotibold	1692942ec2	added a permissions example with just a per-user-throttle which we may want to expand with some auth examples.	2011-06-20 01:11:45 +02:00
markotibold	ef8c286f86	added a permissions example with just a per-user-throttle which we may want to expand with some auth examples.	2011-06-20 01:11:08 +02:00
markotibold	37db771cb9	added a permissions example with just a per-user-throttle which we may want to expand with some auth examples.	2011-06-20 01:10:25 +02:00
Tom Christie	f02a4e1890	Additional test for JSON	2011-06-15 16:25:59 +01:00
Tom Christie	06f69b4dce	Version 0.2.3 release notes	2011-06-15 14:43:35 +01:00
Tom Christie	8b3c807fd4	Version 0.2.3	2011-06-15 14:41:53 +01:00
Tom Christie	1cb84cd4e8	Merge throttling and fix up a coupla things	2011-06-15 14:41:09 +01:00
Tom Christie	ff6e78323f	update some examples	2011-06-15 14:09:57 +01:00
Tom Christie	7dcb851c7f	Allow related models to be fully serialized	2011-06-15 14:09:01 +01:00
Tom Christie	412b5fc2d5	Support for nesting resources etc... ... --HG-- rename : djangorestframework/tests/resources.py => djangorestframework/tests/serializer.py	2011-06-14 18:22:13 +01:00
Tom Christie	323d52e7c4	Bits of cleaning up for the throttling	2011-06-14 11:08:29 +01:00
Tom Christie	fb26b11a75	Add PerViewThrottling and PerResourceThrottling to __all__	2011-06-14 10:31:18 +01:00
Tom Christie	612d335c4c	Add PerViewThrottling and PerResourceThrottling to __all__	2011-06-14 10:30:29 +01:00