encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 08:29:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
433 Commits 15 Branches 133 Tags 132 MiB
8fe06939f2
Commit Graph

433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GitHub Merge Button
8fe06939f2 Merge 6261d8c02b into 59afd87cd4 2011-12-09 03:28:59 -08:00
Tom Christie
59afd87cd4 We do not have a blog. We do not host on BitBucket. 2011-12-09 11:28:50 +00:00
Tom Christie
34a2526fd0 Fix docstring. 2011-12-09 11:27:34 +00:00
Tom Christie
a3f483a6b1 Drop tests that are broken, because the functionality isn't implemented. 
Could be slightly nicer behavior about preserving .POST usability, but
it's not there yet.  These two test check for that but are currently
broken.  Leave them out for now.
 2011-12-09 11:27:34 +00:00
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
Craig Blaszczyk
6261d8c02b Merge remote-tracking branch 'origin/xmlparser' into autodiscover 2011-09-12 16:05:35 +01:00
Craig Blaszczyk
335583bb11 make unit tests run again 2011-09-12 16:05:15 +01:00
Craig Blaszczyk
36759f733e Merge branch 'autodiscover' of github.com:jakul/django-rest-framework into autodiscover 2011-09-02 12:01:03 +01:00
Craig Blaszczyk
e97cafabb6 update to pass data and files as kwargs 2011-09-02 11:57:48 +01:00
Craig Blaszczyk
d42adf3454 Merge remote-tracking branch 'tomchristie/master' into autodiscover 2011-08-28 23:09:00 +01:00
Craig Blaszczyk
06ac5209ac initial XML parsing checkin 2011-08-28 22:54:02 +01: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
Craig Blaszczyk
eef995a21c allow primary key to be non-numeric 2011-08-15 14:59:24 +01:00
Craig Blaszczyk
0d213f1439 update form to have access to the request object 2011-08-09 16:52:19 +01:00
Tom Christie
0542382489 Merge pull request #57 from ulmus/master 
Fixed documentstring misalign in ModelResource
 2011-08-04 04:42:21 -07:00
Craig Blaszczyk
98ec89a575 refactor the way URLs works to be more like the admin site, where there is a subobject for each resource. 2011-08-01 12:49:54 +01: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
Craig Blaszczyk
c18d8f02d0 remove pdb 2011-08-01 09:56:54 +01: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
Craig Blaszczyk
912399c12a change flag default for backwards compatibility 2011-07-29 13:04:22 +01:00
Craig Blaszczyk
7814bc9761 add flag to skip tests 2011-07-29 13:03:52 +01: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
Craig Blaszczyk
46ec20be79 make CSRF check optional on POST requests 2011-07-26 12:58:03 +01:00
Craig Blaszczyk
7070fa298c change text of PERMISSION_DENIED response 2011-07-26 12:10:54 +01:00
Craig Blaszczyk
3eba22eea4 add permission denied error message 2011-07-26 12:03:27 +01:00
Craig Blaszczyk
f71f3aa422 reword error message when user not logged in; add request to permission (so we can check permissions based on the type of request) 2011-07-26 11:57:33 +01:00
Craig Blaszczyk
68487c846b update list URL to not match instead of the change url 2011-07-22 14:35:05 +01:00
Craig Blaszczyk
8837903f83 remove print 2011-07-22 14:23:39 +01:00
Craig Blaszczyk
a3af60651f remove extra newline, so version finding regexp works 2011-07-22 12:08:09 +01: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
Craig Blaszczyk
0490ca39ac add version codes into __all__ 2011-07-22 12:00:58 +01:00
Craig Blaszczyk
fbc483e854 remove bad version guessing mechanism 2011-07-22 11:59:25 +01:00
Craig Blaszczyk
742e9289cf inital work on autodiscover 2011-07-22 11:17:42 +01: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