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
markotibold
f67c0651ba
syncing dependencies.
2011-06-26 02:58:42 +02:00
markotibold
d417a1a20a
moved from examples/requirements.txt to main requirements.txt
2011-06-26 01:41:15 +02:00
markotibold
8cab127c2a
some restyling and updated requirements.txt for yaml support
2011-06-26 01:38:56 +02:00
markotibold
9be3d38aa0
Very basic YAML support. Probably needs some tweaking, and definitely needs tests.
2011-06-26 01:35:38 +02:00
markotibold
7f536c1db3
Very basic YAML support. Probably needs some tweaking, and definitely needs tests.
2011-06-26 01:34:52 +02:00
markotibold
0b18b58c17
On 403's no forms will be displayed anymore
2011-06-26 01:32:27 +02:00
markotibold
43c63c60ce
Smaller version in the header
2011-06-25 23:07:06 +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
markotibold
209ee82903
Merge with 4b1ee62051cce8fa9b83ac740d7262ad4a55494b
2011-06-25 17:31:04 +02:00
Tom Christie
14586916e2
Urg. Fixed bug in assigning headers
2011-06-25 16:13:58 +01:00
markotibold
bae21b14c9
added a container view for the permissions example
2011-06-25 16:38:16 +02: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
markotibold
ddd36206bc
Added a fixture so that the users default have a user to login with and play with permissions.
2011-06-25 13:08:46 +02: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
