aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11hg-git mergingtom christie tom@tomchristie.com
2011-07-11Merge branch 'master' of github.com:tomchristie/django-rest-frameworkTom Christie
2011-07-11typo in testTom Christie
2011-07-11Update Authors. Also It's going to be too hard to track who's done exactly ↵Tom Christie
what, so I'm just going to go with names for now...
2011-07-11Merge pull request #46 from jakul/m2m_create_throughTom Christie
Update to existing pull request "Support for creating objects with m2m relationsM2m"
2011-07-11Merge 91b9d0b2a3fa55ff163f64bc689a59ca01cff8bb into ↵GitHub Merge Button
5433cb3e27058c2f7da6118ffa9ee7712846048d
2011-07-11Merge pull request #44 from fzunino/m2m_createTom Christie
Support for creating objects with m2m relations
2011-07-11Merge 8a2944acdf66a966f0bd4ea4770f012f2597fb4e into ↵GitHub Merge Button
e4ce57b88cdcb3a0e642d05a74b392c3303929fc
2011-07-11Merge pull request #45 from sebpiq/masterTom Christie
Clean overloads + fixed a bug in serializers
2011-07-08Merge 91b9d0b2a3fa55ff163f64bc689a59ca01cff8bb into ↵GitHub Merge Button
3b2e70dd3a3bbac0fb5318329483b4a4eb20410a
2011-07-08Merge 8a2944acdf66a966f0bd4ea4770f012f2597fb4e into ↵GitHub Merge Button
3b2e70dd3a3bbac0fb5318329483b4a4eb20410a
2011-07-08remove hardcoded model._meta.many_to_many[0]; update mixin tests to test ↵Craig Blaszczyk
with 0, 1, or multiple groups
2011-07-08update mixin to work with m2m data using a through field, by storing the ↵Craig Blaszczyk
name of the field and manually creating an object in the related table
2011-07-08add unit tests which show m2m creation failing for through tableCraig Blaszczyk
2011-07-07Tests for CreateModelMixin (unit and integration test via ↵Fernando Zunino
ListOrCreateModelView).
2011-07-06Merge 11ee3857437e2d6f4e6ddc89ee0289e90395c1c4 into ↵GitHub Merge Button
3b2e70dd3a3bbac0fb5318329483b4a4eb20410a
2011-07-06fixed a bug in serializersSébastien Piquemal
2011-07-06now cleans data from parameters used for overloadsSébastien Piquemal
2011-07-05Merge pull request #43 from sebpiq/masterTom Christie
Corrected bug in serializers
2011-07-05Support for creating objects with m2m relationsFernando Zunino
2011-07-04Merge 3161475562c3a529389657f21813f91864b0787a into ↵GitHub Merge Button
2dc042f0cf3a3d6049a1d2641d99b9e10f691b35
2011-07-04debugged serializersSébastien Piquemal
2011-07-02Picky. :)Tom Christie
2011-07-02Merge pull request #40 from ulmus/masterTom Christie
Added parsers.DEFAULT_PARSERS
2011-07-02Merge 3e0a978dd97a55a5db072584a2bba639ed790b82 into ↵GitHub Merge Button
1885012d61c7ba78e78648ef2bff89e4337c0407
2011-07-02Fixed YAMLParser = NoneJens Alm
2011-07-02Merge 20c7e605c987bbfec23fbd305e71168b21672bec into ↵GitHub Merge Button
1885012d61c7ba78e78648ef2bff89e4337c0407
2011-07-02Sloppy copy-pasting...Jens Alm
2011-07-02parsers.DEFAULT_PARSERS added to be consistent with renderers.DEFAULT_RENDERERSJens Alm
2011-07-02Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkJens Alm
Conflicts: djangorestframework/views.py Signed-off-by: Jens Alm <jens.alm@mac.com>
2011-07-02.gitignoreJens Alm
2011-07-02gitignoreJens Alm
2011-07-02Set default renderers for views when yaml is not installedJens Alm
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-02Edited AUTHORS via GitHubTom Christie
2011-07-02Merge pull request #37 from fzunino/none-renderer-fixTom Christie
Fix: Crash when yaml isn't installed.
2011-07-02Merge 3b81453fd1e3f6570586dcedab16a52fdec577e6 into ↵GitHub Merge Button
83b47c4b766273f0691c0a81a373237867de75af
2011-07-02Fix: Crash when yaml isn't installed.Fernando Zunino
2011-07-02TypoTom Christie
2011-07-01pull in markos changes, minor tweaks to yaml stuffTom Christie
2011-07-01Tweak intro in READMETom Christie
2011-07-01Merge hg-git ickynessTom Christie
2011-07-01Urg, force update after hg-git ickynessTom Christie
2011-07-01Try to force README.rst to renameTom Christie
2011-07-01Try to force README.rst to renameTom Christie
--HG-- rename : README.rst => README