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

800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marko Tibold
1c8b40fb5f Merge branch 'master' of https://github.com/alazaro/django-rest-framework into alazaro-master 2011-12-15 23:05:30 +01:00
Marko Tibold
c1858a2a9a Merge remote-tracking branch 'upstream/master' 2011-12-15 19:39:56 +01:00
Tom Christie
28ccabf165 Use coverage>=3.4, since that's what we've got in tox.ini at the moment. Refs #96 2011-12-15 16:22:10 +00:00
Tom Christie
83910ff7a4 Update requirements. Refs #96 2011-12-15 16:20:37 +00:00
Marko Tibold
c509c2bff2 Merge remote-tracking branch 'upstream/master' 2011-12-15 14:56:47 +01:00
Marko Tibold
beccc54d11 Update docs/howto/setup.rst 2011-12-15 14:56:01 +01:00
Marko Tibold
59904576a2 reduced output to errors and warnings only 2011-12-15 12:25:56 +01:00
Marko Tibold
670dbe6d75 Don't output html to a tempdir, but keep them. 2011-12-15 01:16:09 +01:00
Marko Tibold
0f16db7614 see previous commit message. 2011-12-15 00:31:57 +01:00
Marko Tibold
e2b9359a2d Adding a docs env to the tox project. 
This will run the linkcheck and build the html docs, turning any warnings into
errors.
Also changed the theme to sphinx-doc and added version to be displayed in the
docs.
 2011-12-15 00:27:29 +01:00
alazaro
4a60575132 Fixed test broken by markdown update 
Removed unused code. No longer needed with  markdown 2.1.0.
 2011-12-14 23:36:13 +01:00
Tom Christie
8cabab2703 CSRF for non-dict like .DATA. Fixes #85 2011-12-14 20:19:17 +00:00
Tom Christie
67b13bd1bc More general requirements. 2011-12-14 20:11:02 +00:00
Tom Christie
d53f7f45b4 Use 1.4's CSRFMiddleware, so that PUT and DELETE get CSRF validation if session authentication is being used 2011-12-14 20:10:06 +00:00
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