encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-24 02:24:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
708 Commits 18 Branches 132 Tags 105 MiB
cb7a815560
Commit Graph

708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
2caf879f22 Edited AUTHORS via GitHub 2011-09-30 14:16:25 +02:00
Tom Christie
36b41aebb3 Edited AUTHORS via GitHub 2011-09-29 19:48:25 +02:00
Tom Christie
249eb6f931 Make sure to check for "is not None" so that depth=0 gets assigned properly. Thanks thomasst. 2011-09-29 19:47:20 +02:00
Tom Christie
b71a24437a Merge pull request #68 from masont/master 
Changed user.is_staff() to user.is_staff
 2011-08-24 01:32:00 -07:00
Mason Tang
c50637287b Fix in permissions, user.is_staff is a field, not a function. 2011-08-24 07:49:16 -03:00
Tom Christie
0542382489 Merge pull request #57 from ulmus/master 
Fixed documentstring misalign in ModelResource
 2011-08-04 04:42:21 -07:00
Tom Christie
642d73f4e7 Edited AUTHORS via GitHub 2011-08-01 11:22:51 +02:00
Tom Christie
9682c9b9b2 Edited AUTHORS via GitHub 2011-08-01 11:22:07 +02:00
Tom Christie
6d1207fdcf Edited AUTHORS via GitHub 2011-07-31 22:35:36 +02:00
Tom Christie
a2c80f8793 Merge pull request #64 from amccloud/master 
Fix for issue #63
 2011-07-31 13:33:58 -07:00
Andrew McCloud
968c5e43f3 Removed rogue import for LimitBytes to fix issue #63 2011-07-31 13:21:06 -07:00
Carles Barrobés
3b413dbb40 Added support for OPTIONS method, including a few unit tests 2011-07-30 22:23:53 +02:00
Tom Christie
53fcf29081 Merge pull request #59 from gwrtheyrn/patch-1 
Fixed TypeError that occurs without request data.
 2011-07-27 08:53:41 -07:00
Danilo Bargen
e3c00e4c1e Fixed TypeError that occurs without request data. 
If no request data gets sent, allowed_extra_fields is a set and can't be joined to a tuple using the + operator.
 2011-07-27 18:32:19 +03:00
Tom Christie
746b817ad3 Whitespace tweaks 2011-07-22 04:03:04 -07:00
Tom Christie
524954b246 Whitespace tweak 2011-07-22 04:01:38 -07:00
Tom Christie
b9fcea093c Edited djangorestframework/permissions.py via GitHub 2011-07-19 14:33:02 -07:00
Jens Alm
7dcd2738a5 Fixed misaligned documentation on ModelResource. 
Added basic documentation for nested resources

Signed-off-by: Jens Alm <jens.alm@mac.com>
 2011-07-19 22:09:35 +02:00
Tom Christie
f29e2fc91f Edited AUTHORS via GitHub 2011-07-19 12:48:28 -07:00
Tom Christie
d03bdba54c Merge pull request #53 from ulmus/master 
ModelResource __init__ doesn't handle depth and stack arguments
 2011-07-19 12:46:19 -07:00
Tom Christie
e956d5177e Revert "Added pagination mixin. Need to write tests" 
This reverts commit 1eb2dfcc3a.
 2011-07-19 20:39:20 +01:00
Tom Christie
20a95db60a Revert "Now throws a 404 if page isn't an int" 
This reverts commit ae059c78da.
 2011-07-19 20:39:15 +01:00
Tom Christie
8136a94ebe Revert pagination stuff 
This reverts commit d1af049698.
 2011-07-19 20:38:13 +01:00
Tom Drummond
d1af049698 Added tests for pagination 2011-07-19 18:00:50 +01:00
Tom Drummond
ae059c78da Now throws a 404 if page isn't an int 2011-07-19 17:54:37 +01:00
Tom Drummond
1eb2dfcc3a Added pagination mixin. Need to write tests 2011-07-19 17:06:56 +01:00
Jens Alm
88fa45edc2 Fixed __init__ arguments on ModelResource 
Signed-off-by: Jens Alm <jens.alm@mac.com>
 2011-07-19 00:07:00 +02:00
Tom Drummond
a53101bea9 More tests for overloaded json requests and normal json requests 2011-07-15 17:19:12 +01:00
Tom Drummond
7e2e3cbf6e Added more tests related to request.POST and request.DATA 2011-07-15 16:59:50 +01:00
Tom Drummond
6bbfbf77e2 Added tests to ensure you can access request.POST with UserLoggedInAuthentication 2011-07-15 16:14:35 +01:00
Tom Christie
73ad2e5054 Edited AUTHORS via GitHub 2011-07-14 02:09:35 -07:00
Tom Christie
dd5742bf0b Edited AUTHORS via GitHub 2011-07-14 02:09:21 -07:00
Tom Christie
2c9cda8acc Edited AUTHORS via GitHub 2011-07-14 02:09:02 -07:00
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