Commit Graph

  • a2a6bae17c hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:28:35 +0100
  • a2bc0bdafa hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:28:23 +0100
  • c70da25e46 hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:28:19 +0100
  • bab9200f33 hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:28:06 +0100
  • 5e6a869abc hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:28:00 +0100
  • d9fef5cb21 hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:27:21 +0100
  • 1135505e7d hg-git merging tom christie tom@tomchristie.com 2011-07-11 21:27:08 +0100
  • f7a213bde9 Merge branch 'master' of github.com:tomchristie/django-rest-framework Tom Christie 2011-07-11 20:53:43 +0100
  • 4c590df712 typo in test Tom Christie 2011-07-11 20:52:02 +0100
  • 247d242e07 Update Authors. Also It's going to be too hard to track who's done exactly what, so I'm just going to go with names for now... Tom Christie 2011-07-11 12:47:56 -0700
  • d1ed9884d8 Merge pull request #46 from jakul/m2m_create_through Tom Christie 2011-07-11 12:33:52 -0700
  • 2b90906293 Merge 91b9d0b2a3 into 5433cb3e27 GitHub Merge Button 2011-07-11 12:33:49 -0700
  • 5433cb3e27 Merge pull request #44 from fzunino/m2m_create Tom Christie 2011-07-11 12:33:40 -0700
  • 7f0b291528 Merge 8a2944acdf into e4ce57b88c GitHub Merge Button 2011-07-11 12:33:31 -0700
  • e4ce57b88c Merge pull request #45 from sebpiq/master Tom Christie 2011-07-11 12:33:15 -0700
  • 3a4f39497b Merge 91b9d0b2a3 into 3b2e70dd3a GitHub Merge Button 2011-07-08 14:59:57 -0700
  • f213ca0afe Merge 8a2944acdf into 3b2e70dd3a GitHub Merge Button 2011-07-08 12:51:01 -0700
  • 91b9d0b2a3 remove hardcoded model._meta.many_to_many[0]; update mixin tests to test with 0, 1, or multiple groups Craig Blaszczyk 2011-07-08 18:14:52 +0100
  • 344db0d733 update mixin to work with m2m data using a through field, by storing the name of the field and manually creating an object in the related table Craig Blaszczyk 2011-07-08 18:04:22 +0100
  • 6e6b35b5c0 add unit tests which show m2m creation failing for through table Craig Blaszczyk 2011-07-08 17:37:20 +0100
  • 8a2944acdf Tests for CreateModelMixin (unit and integration test via ListOrCreateModelView). Fernando Zunino 2011-07-07 23:33:39 -0300
  • 03a73cf95d Merge 11ee385743 into 3b2e70dd3a GitHub Merge Button 2011-07-06 04:42:39 -0700
  • 11ee385743 fixed a bug in serializers Sébastien Piquemal 2011-07-06 14:18:48 +0300
  • e53c3cd417 now cleans data from parameters used for overloads Sébastien Piquemal 2011-07-06 14:05:57 +0300
  • 3b2e70dd3a Merge pull request #43 from sebpiq/master Tom Christie 2011-07-05 02:48:05 -0700
  • a634d10cbf Support for creating objects with m2m relations Fernando Zunino 2011-07-05 02:25:39 -0300
  • 4887ac9495 Merge 3161475562 into 2dc042f0cf GitHub Merge Button 2011-07-04 01:36:29 -0700
  • 3161475562 debugged serializers Sébastien Piquemal 2011-07-04 11:31:46 +0300
  • 2dc042f0cf Picky. :) Tom Christie 2011-07-02 10:37:51 -0700
  • f43f20bd3a Merge pull request #40 from ulmus/master Tom Christie 2011-07-02 10:36:26 -0700
  • c042b43e0c Merge 3e0a978dd9 into 1885012d61 GitHub Merge Button 2011-07-02 10:35:12 -0700
  • 3e0a978dd9 Fixed YAMLParser = None Jens Alm 2011-07-02 19:19:45 +0200
  • f168ac9938 Merge 20c7e605c9 into 1885012d61 GitHub Merge Button 2011-07-02 10:16:47 -0700
  • 20c7e605c9 Sloppy copy-pasting... Jens Alm 2011-07-02 19:12:43 +0200
  • f73588eb42 parsers.DEFAULT_PARSERS added to be consistent with renderers.DEFAULT_RENDERERS Jens Alm 2011-07-02 19:03:26 +0200
  • 9baed0aed2 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Jens Alm 2011-07-02 18:48:40 +0200
  • 3900abd37f .gitignore Jens Alm 2011-07-02 18:40:25 +0200
  • bcddc6f09a gitignore Jens Alm 2011-07-02 18:39:27 +0200
  • 7ee1bbecc6 Set default renderers for views when yaml is not installed Jens Alm 2011-07-02 18:38:55 +0200
  • 1885012d61 Edited AUTHORS via GitHub Tom Christie 2011-07-02 09:37:18 -0700
  • 17303fc85e Merge pull request #37 from fzunino/none-renderer-fix Tom Christie 2011-07-02 09:36:13 -0700
  • f54911f47a Merge 3b81453fd1 into 83b47c4b76 GitHub Merge Button 2011-07-02 09:34:28 -0700
  • 3b81453fd1 Fix: Crash when yaml isn't installed. Fernando Zunino 2011-07-02 12:56:57 -0300
  • 83b47c4b76 Typo Tom Christie 2011-07-02 04:33:47 -0700
  • f7b7778a79 pull in markos changes, minor tweaks to yaml stuff Tom Christie 2011-07-01 17:44:08 +0100
  • c3babe751a Tweak intro in README Tom Christie 2011-07-01 16:24:32 +0100
  • 0a7ac40a0d Merge hg-git ickyness Tom Christie 2011-07-01 16:06:20 +0100
  • c4fe5a920b Urg, force update after hg-git ickyness Tom Christie 2011-07-01 16:05:22 +0100
  • 4136454b95 Try to force README.rst to rename Tom Christie 2011-07-01 15:55:33 +0100
  • 601430c293 Try to force README.rst to rename Tom Christie 2011-07-01 15:54:24 +0100
  • e46a83b19c Try to for README to rename Tom Christie 2011-07-01 15:52:54 +0100
  • 605ece1ae3 Tweak Tom Christie 2011-07-01 13:25:59 +0100
  • bcc09998dd Tweak Tom Christie 2011-07-01 13:19:26 +0100
  • 630785f5a9 Markup the README Tom Christie 2011-07-01 13:17:59 +0100
  • 8d51759dd1 Fix bitbucket issue 39. All further issues should be on github Tom Christie 2011-07-01 12:29:42 +0100
  • 2ebcc9d3dd Mmm, unconvinced if this whole hg-git thing is a good plan... Tom Christie 2011-07-01 11:36:15 +0100
  • 892e4eea98 Merge 60cd5363ab into 16d8c3255d GitHub Merge Button 2011-07-01 03:34:10 -0700
  • ca4b7560cb merge Tom Christie 2011-07-01 11:31:04 +0100
  • 16d8c3255d Fix #36 Tom Christie 2011-07-01 03:30:28 -0700
  • dc9960f770 Merge 60cd5363ab into 8bafa01abd GitHub Merge Button 2011-07-01 00:25:37 -0700
  • 60cd5363ab FIX: ModelViews can have Resources whose models have unique fields. Fernando Zunino 2011-07-01 03:32:04 -0300
  • 8bafa01abd Tidy up oauth imports slightly Tom Christie 2011-06-30 08:52:55 +0100
  • 5d61ff3508 Merge ickyness Tom Christie 2011-06-30 08:50:23 +0100
  • 1e8721a5a0 Urg Tom Christie 2011-06-30 08:49:54 +0100
  • 1d35c7fc4c Ug Tom Christie 2011-06-30 08:48:07 +0100
  • 5e2237149d Fixing merge mess of hg-git ickyness. Tom Christie 2011-06-30 08:47:48 +0100
  • a1555cfd99 Add astraw to AUTHORS Tom Christie 2011-06-30 08:46:28 +0100
  • 93e95bac8d merge from astraw Tom Christie 2011-06-30 08:41:51 +0100
  • 019cb7f7d7 Merge pull request #33 from astraw/master Tom Christie 2011-06-29 14:31:30 -0700
  • 7ff22fa94f Merge f6e4578656 into d714901a60 GitHub Merge Button 2011-06-29 14:29:03 -0700
  • f6e4578656 return 400 BAD REQUEST rather than Django traceback/500 error on failed multipart parse Andrew Straw 2011-06-29 23:02:00 +0200
  • e5e019b0b3 Pull in David's initial oauth tests Tom Christie 2011-06-28 08:53:53 +0100
  • d714901a60 Remove erronous traceback Tom Christie 2011-06-27 10:30:00 +0100
  • d8bec115ad Allow .json .html .xml style urls and also allow these formats to be specified in a "?format=..." query string. Michael Fötsch 2011-06-26 16:03:36 +0200
  • f67c0651ba syncing dependencies. markotibold 2011-06-26 02:58:42 +0200
  • d417a1a20a moved from examples/requirements.txt to main requirements.txt markotibold 2011-06-26 01:41:15 +0200
  • 8cab127c2a some restyling and updated requirements.txt for yaml support markotibold 2011-06-26 01:38:56 +0200
  • 9be3d38aa0 Very basic YAML support. Probably needs some tweaking, and definitely needs tests. markotibold 2011-06-26 01:35:38 +0200
  • 7f536c1db3 Very basic YAML support. Probably needs some tweaking, and definitely needs tests. markotibold 2011-06-26 01:34:52 +0200
  • 0b18b58c17 On 403's no forms will be displayed anymore markotibold 2011-06-26 01:32:27 +0200
  • 43c63c60ce Smaller version in the header markotibold 2011-06-25 23:07:06 +0200
  • fe7e3ba3ae Adding tests for OAuth authentication through django-oauth-plus, a dedicated example project is still missing though David Larlet 2011-06-25 18:42:03 +0200
  • 209ee82903 Merge with 4b1ee62051cce8fa9b83ac740d7262ad4a55494b markotibold 2011-06-25 17:31:04 +0200
  • 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? Tom Christie 2011-06-25 17:13:32 +0100
  • 14586916e2 Urg. Fixed bug in assigning headers Tom Christie 2011-06-25 16:13:58 +0100
  • bae21b14c9 added a container view for the permissions example markotibold 2011-06-25 16:38:16 +0200
  • d2b5ea107e Typo in url Tom Christie 2011-06-25 14:58:26 +0100
  • d3557bdcd0 Allow HEAD method Tom Christie 2011-06-25 14:53:48 +0100
  • ddd36206bc Added a fixture so that the users default have a user to login with and play with permissions. markotibold 2011-06-25 13:08:46 +0200
  • 0626b618ad Support for HEAD method Carles Barrobés 2011-06-25 12:35:17 +0200
  • 50efa10652 Add version to html Tom Christie 2011-06-25 10:25:26 +0100
  • 409ee533fd merge markos throttling example Tom Christie 2011-06-21 23:05:23 +0100
  • 82de0cf50a Decimals are a protected_type - let's leave them up to the renderer to deal with Tom Christie 2011-06-21 23:01:41 +0100
  • 1692942ec2 added a permissions example with just a per-user-throttle which we may want to expand with some auth examples. markotibold 2011-06-20 01:11:45 +0200
  • ef8c286f86 added a permissions example with just a per-user-throttle which we may want to expand with some auth examples. markotibold 2011-06-20 01:11:08 +0200
  • 37db771cb9 added a permissions example with just a per-user-throttle which we may want to expand with some auth examples. markotibold 2011-06-20 01:10:25 +0200
  • f02a4e1890 Additional test for JSON Tom Christie 2011-06-15 16:25:59 +0100
  • 06f69b4dce Version 0.2.3 release notes Tom Christie 2011-06-15 14:43:35 +0100
  • 8b3c807fd4 Version 0.2.3 Tom Christie 2011-06-15 14:41:53 +0100
  • 1cb84cd4e8 Merge throttling and fix up a coupla things Tom Christie 2011-06-15 14:41:09 +0100