encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 13:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,786 Commits 18 Branches 132 Tags 105 MiB
c95fa81cb2
Commit Graph

1786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
050f07e7b1 Ensure that external projects do not need to add 'djangorestframework.tests' to INSTALLED_APPS during testing. 2011-12-14 19:23:48 +00:00
Marko Tibold
4f38e78580 Merge pull request #92 from mwesterhof/master 
Serializer.serialize_model fix of uncaught _SkipField exceptions
 2011-12-13 04:06:40 -08:00
Marco Westerhof
2be350293b fix for unhandled _SkipField exception in Serializer.serialize_model 2011-12-13 11:14:23 +01:00
Marko Tibold
8cd7ab1422 typo 2011-12-12 22:20:09 +01:00
Marko Tibold
ac18bea009 deleted reference to bitbucket from the docs 2011-12-12 20:53:10 +01:00
Marko Tibold
1686419aad less is more; dropped the mention of Bitbucket repo 2011-12-12 19:56:39 +01:00
Marko Tibold
3867438779 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2011-12-12 09:42:27 -06:00
Marko Tibold
51c53a8a5c now really drop the yaml file 2011-12-12 09:41:18 -06:00
Tom Christie
cb8931a014 Typo. 2011-12-12 15:33:45 +00:00
Marko Tibold
c0bf45d82a drop yaml fixture and replace with json 2011-12-12 08:51:02 -06:00
Tom Christie
d69581e2af 0.2.4 release. 2011-12-12 12:27:11 +00:00
Tom Christie
d89b24cbe9 0.2.4 release. 2011-12-12 12:27:11 +00:00
Tom Christie
5c6adb1cca Drop unused import 2011-12-12 12:09:12 +00:00
Marko Tibold
7b6a6caa96 fix copy-paste typo. 2011-12-12 12:09:10 +01:00
Tom Christie
3a4ca88a6c Add OPTIONS to auto-documenting API 2011-12-11 18:52:55 +00:00
Tom Christie
e2f3153b13 Merge pull request #90 from jakul/xmlparser6 
Lovely stuff!
 2011-12-11 10:42:37 -08:00
Craig Blaszczyk
e84bf2140c fix merge 2011-12-11 18:30:43 +00:00
Craig Blaszczyk
0632e946f9 add xml parser 2011-12-11 18:27:40 +00:00
Tom Christie
4f42303035 Typo. 2011-12-09 13:39:56 +00:00
Tom Christie
5db422c9d3 Add pagination. Thanks @devioustree! 2011-12-09 13:37:53 +00:00
Tom Christie
42cdd00591 Merge meurig's absolute_url fix. 2011-12-09 12:54:11 +00:00
Tom Christie
325ee1e3a4 Merge pull request #62 from txels/master 
HTTP OPTIONS support
 2011-12-09 04:40:14 -08:00
Tom Christie
20f8956c8f Merge monseiur drummond's pagination niceness 2011-12-09 12:35:42 +00: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
Meurig Freeman
e704705383 whitespace fix 2011-10-31 04:02:40 +00:00
Meurig Freeman
5541f0af44 make use of original prefix when generating absolute urls 2011-10-31 03:58:00 +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
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