Tom Christie
1cc500b830
Edited AUTHORS via GitHub
2011-07-14 02:08:46 -07:00
Tom Christie
3ef8b7694e
Added garciasolero
2011-07-14 02:01:13 -07:00
Tom Christie
30cd9335e0
Merge pull request #49 from garciasolero/master
...
Testing serialization error
2011-07-14 01:58:30 -07:00
garciasolero
cc7a77c477
Test for serialitation of dictionaries with keys that collide with
...
dictionary method names
2011-07-13 14:12:34 +02:00
Tom Christie
39d9ac9d1b
Improve coverage reporting
2011-07-13 12:37:52 +01:00
tom christie tom@tomchristie.com
9ec50ac442
hg-git merging
2011-07-11 21:28:53 +01:00
tom christie tom@tomchristie.com
a42ec167e0
hg-git merging
2011-07-11 21:28:45 +01:00
tom christie tom@tomchristie.com
e12a91c483
hg-git merging
2011-07-11 21:28:40 +01:00
tom christie tom@tomchristie.com
a2a6bae17c
hg-git merging
2011-07-11 21:28:35 +01:00
tom christie tom@tomchristie.com
a2bc0bdafa
hg-git merging
2011-07-11 21:28:23 +01:00
tom christie tom@tomchristie.com
c70da25e46
hg-git merging
2011-07-11 21:28:19 +01:00
tom christie tom@tomchristie.com
bab9200f33
hg-git merging
2011-07-11 21:28:06 +01:00
tom christie tom@tomchristie.com
5e6a869abc
hg-git merging
2011-07-11 21:28:00 +01:00
tom christie tom@tomchristie.com
d9fef5cb21
hg-git merging
2011-07-11 21:27:21 +01:00
tom christie tom@tomchristie.com
1135505e7d
hg-git merging
2011-07-11 21:27:08 +01:00
Tom Christie
f7a213bde9
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2011-07-11 20:53:43 +01:00
Tom Christie
4c590df712
typo in test
2011-07-11 20:53:05 +01:00
Tom Christie
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...
2011-07-11 12:47:56 -07:00
Tom Christie
d1ed9884d8
Merge pull request #46 from jakul/m2m_create_through
...
Update to existing pull request "Support for creating objects with m2m relationsM2m"
2011-07-11 12:33:52 -07:00
GitHub Merge Button
2b90906293
Merge 91b9d0b2a3
into 5433cb3e27
2011-07-11 12:33:49 -07:00
Tom Christie
5433cb3e27
Merge pull request #44 from fzunino/m2m_create
...
Support for creating objects with m2m relations
2011-07-11 12:33:40 -07:00
GitHub Merge Button
7f0b291528
Merge 8a2944acdf
into e4ce57b88c
2011-07-11 12:33:31 -07:00
Tom Christie
e4ce57b88c
Merge pull request #45 from sebpiq/master
...
Clean overloads + fixed a bug in serializers
2011-07-11 12:33:15 -07:00
GitHub Merge Button
3a4f39497b
Merge 91b9d0b2a3
into 3b2e70dd3a
2011-07-08 14:59:57 -07:00
GitHub Merge Button
f213ca0afe
Merge 8a2944acdf
into 3b2e70dd3a
2011-07-08 12:51:01 -07:00
Craig Blaszczyk
91b9d0b2a3
remove hardcoded model._meta.many_to_many[0]; update mixin tests to test with 0, 1, or multiple groups
2011-07-08 18:14:52 +01:00
Craig Blaszczyk
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
2011-07-08 18:04:22 +01:00
Craig Blaszczyk
6e6b35b5c0
add unit tests which show m2m creation failing for through table
2011-07-08 17:37:20 +01:00
Fernando Zunino
8a2944acdf
Tests for CreateModelMixin (unit and integration test via ListOrCreateModelView).
2011-07-07 23:33:39 -03:00
GitHub Merge Button
03a73cf95d
Merge 11ee385743
into 3b2e70dd3a
2011-07-06 04:42:39 -07:00
Sébastien Piquemal
11ee385743
fixed a bug in serializers
2011-07-06 14:18:48 +03:00
Sébastien Piquemal
e53c3cd417
now cleans data from parameters used for overloads
2011-07-06 14:05:57 +03:00
Tom Christie
3b2e70dd3a
Merge pull request #43 from sebpiq/master
...
Corrected bug in serializers
2011-07-05 02:48:05 -07:00
Fernando Zunino
a634d10cbf
Support for creating objects with m2m relations
2011-07-05 02:25:39 -03:00
GitHub Merge Button
4887ac9495
Merge 3161475562
into 2dc042f0cf
2011-07-04 01:36:29 -07:00
Sébastien Piquemal
3161475562
debugged serializers
2011-07-04 11:31:46 +03:00
Tom Christie
2dc042f0cf
Picky. :)
2011-07-02 10:37:51 -07:00
Tom Christie
f43f20bd3a
Merge pull request #40 from ulmus/master
...
Added parsers.DEFAULT_PARSERS
2011-07-02 10:36:26 -07:00
GitHub Merge Button
c042b43e0c
Merge 3e0a978dd9
into 1885012d61
2011-07-02 10:35:12 -07:00
Jens Alm
3e0a978dd9
Fixed YAMLParser = None
2011-07-02 19:19:45 +02:00
GitHub Merge Button
f168ac9938
Merge 20c7e605c9
into 1885012d61
2011-07-02 10:16:47 -07:00
Jens Alm
20c7e605c9
Sloppy copy-pasting...
2011-07-02 19:12:43 +02:00
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