encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-24 20:51:19 +03:00
Code Issues Packages Projects Releases Wiki Activity
983 Commits 17 Branches 134 Tags 148 MiB
f8edfa2675
Commit Graph

983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Alm
f73588eb42 parsers.DEFAULT_PARSERS added to be consistent with renderers.DEFAULT_RENDERERS 2011-07-02 19:03:26 +02:00
Jens Alm
9baed0aed2 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 
Conflicts:
	djangorestframework/views.py

Signed-off-by: Jens Alm <jens.alm@mac.com>
 2011-07-02 18:48:40 +02:00
Jens Alm
3900abd37f .gitignore 2011-07-02 18:40:25 +02:00
Jens Alm
bcddc6f09a gitignore 2011-07-02 18:39:27 +02:00
Jens Alm
7ee1bbecc6 Set default renderers for views when yaml is not installed 
Will use the renderer.DEFAULT_RENDERERS dict for determining available renderers in views.View to avoid a nonexistent renderer when yaml is not installed. Duplicates the behavior in parsers.DEFAULT_PARSERS
 2011-07-02 18:38:55 +02:00
Tom Christie
1885012d61 Edited AUTHORS via GitHub 2011-07-02 09:37:18 -07:00
Tom Christie
17303fc85e Merge pull request #37 from fzunino/none-renderer-fix 
Fix: Crash when yaml isn't installed.
 2011-07-02 09:36:13 -07:00
GitHub Merge Button
f54911f47a Merge 3b81453fd1 into 83b47c4b76 2011-07-02 09:34:28 -07:00
Fernando Zunino
3b81453fd1 Fix: Crash when yaml isn't installed. 2011-07-02 12:56:57 -03:00
Tom Christie
83b47c4b76 Typo 2011-07-02 04:33:47 -07:00
Tom Christie
f7b7778a79 pull in markos changes, minor tweaks to yaml stuff 2011-07-01 17:44:08 +01:00
Tom Christie
c3babe751a Tweak intro in README 2011-07-01 16:24:32 +01:00
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
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