encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-16 06:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,784 Commits 18 Branches 132 Tags 105 MiB
a704d5a206
Commit Graph

3784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
42563d9fbc Remove explicit handling of 'OPTIONS' method, just raise the response, rather than returning it. 2012-01-11 14:48:22 +00:00
Tom Christie
ac51210594 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2012-01-11 14:42:21 +00:00
Tom Christie
4c438f9f4d Some minor tidy up 2012-01-11 14:42:16 +00:00
Tom Christie
b522cc8e51 Merge https://github.com/dzen/django-rest-framework 2012-01-11 14:37:25 +00:00
Tom Christie
2d3c32d322 Added @sebzur - Thanks! 2012-01-11 14:09:31 +00:00
Tom Christie
0cfe2acdef Minor cleanup on ModelMixin 2012-01-11 14:07:33 +00:00
Tom Christie
dacc9c0ff7 Merge https://github.com/sebzur/django-rest-framework 2012-01-11 13:54:44 +00:00
Tom Christie
97c5262e9c Refactor add_query_param to use URLObject. Refs #112. 2012-01-11 13:50:43 +00:00
Tom Christie
c8134a6340 Replace tab with spaces. 2012-01-11 13:44:11 +00:00
Tom Christie
b1105edfed Use safe_dump. Fixes #123. 2012-01-11 13:43:47 +00:00
Marko Tibold
aaa14a3e17 fixes #122 
tahanks @remcogerlich
 2012-01-11 10:27:14 +01:00
Sebastian Żurek
86b1495cad QueryMixin to ModelMixin rename. 2012-01-10 21:42:50 +01:00
Sébastien Piquemal
792bc4d608 fixed issue#73 and added a test 2012-01-10 20:38:01 +02:00
Benoit C
35ba2fc65b Merge branch 'master' of https://github.com/dzen/django-rest-framework 
Conflicts:
	djangorestframework/views.py
 2012-01-10 00:25:33 +01:00
Benoit C
96e91f5841 Add test for final() method 2012-01-10 00:23:19 +01:00
Benoit C
4ab67e789e Introduce a final methods in View class 2012-01-10 00:04:10 +01:00
Benoit C
94f24e2e2f Introduce a final methods in View class 2012-01-09 21:09:38 +01:00
Ewoud Kohl van Wijngaarden
0d64b4a704 Make a nested if flat 
This is a possible fix for issue #73.  The problem occurs when the first
if-statement is true, but the second is not. This results into the
variable obj not being set. This commit solves it by removing that
branch.
 2012-01-09 15:56:41 +01:00
Sebastian Żurek
10adf4c31a QueryMixin class updates (comments + docs and the definition of get_instance_data method) 2012-01-08 23:10:21 +01:00
Tom Christie
e712ab0ba1 Added URLObject 2012-01-05 16:13:41 +00:00
Tom Christie
f5a4fc9747 Merge pull request #111 from j4mie/url-generation 
Preserve existing query params in PaginatorMixin
 2012-01-05 07:32:24 -08:00
Jamie Matthews
18535c7a38 Preserve existing query params in PaginatorMixin 
Previously, generation of next/previous links would discard any existing
query parameters. This commit introduces a dependency on URLObject, which
is used to intelligently parse and modify URLs to ensure existing params
are preserved.

Addresses issues #107
 2012-01-05 14:07:31 +00:00
Marko Tibold
b745d0c2f4 Merge pull request #109 from jakul/bare_except_stmts 
Change 'except' for 'except Exception' (Fixes issue #75)
 2012-01-04 10:19:40 -08:00
Craig Blaszczyk
46e4ba258f #75 remove except statements which are overly broad in the exception they catch 2012-01-04 18:05:12 +00:00
Tom Christie
be11336dd9 Twitter handle 2012-01-04 15:49:35 +00:00
Marko Tibold
30d881e215 Don't raise when in compat mode, just pass. 2012-01-04 13:55:37 +01:00
Marko Tibold
1f6e3429e4 Fix indentation 2012-01-04 12:23:12 +01:00
Marko Tibold
47e4f0d37d We can now use @unittests.skip 2012-01-04 11:58:22 +01:00
Tom Christie
591bb630d7 0.3.2-dev 2012-01-04 09:52:06 +00:00
Tom Christie
53921c5c0c Added @natim, @mjumbewu - Thanks :) 2012-01-04 09:50:14 +00:00
Tom Christie
98c563032d Version 0.3.1 2012-01-04 09:44:38 +00:00
Tom Christie
65e324bc19 Merge pull request #108 from mjumbewu/patch-1 
Only set the script_prefix if the prefix isn't already a full URL.
 2012-01-04 01:42:05 -08:00
Mjumbe Poe
7b6c56a73b Only set the script_prefix if the prefix isn't already a full URL. 2012-01-04 04:18:51 -05:00
Sebastian Żurek
abc7439f8d QueryMixin created + related mixins updates 2012-01-03 09:55:12 +01:00
Marko Tibold
ccbb536896 Merge remote-tracking branch 'upstream/master' 2012-01-02 21:17:12 +01:00
Marko Tibold
e0b82ce76d minor style edits 2012-01-02 21:16:44 +01:00
Tom Christie
17290b0beb Add 1.4 2012-01-02 18:39:55 +00:00
Tom Christie
48a79a99e3 Add 1.4. 2012-01-02 18:39:29 +00:00
Tom Christie
9f349ca6fe Rename examples in tox. 2012-01-02 18:37:41 +00:00
Tom Christie
1a72836edc Rename examples in tox. 2012-01-02 18:36:53 +00:00
Tom Christie
0b21af9388 Drop mercurial reference. 2012-01-02 18:31:46 +00:00
Marko Tibold
7a3d97a2fc :mod: directive is nicer here 2012-01-02 18:42:22 +01:00
Marko Tibold
9871532746 Added an example of how to use authentication and throttling. 2012-01-02 18:12:22 +01:00
Marko Tibold
412727440b Add an extra explenation on how to use curl on this view. 2012-01-02 14:55:19 +01:00
Marko Tibold
e419e2066f Colouring of literal code 
Get the nice colouring sphinx provides and fix some more typos.
 2011-12-30 19:03:05 +01:00
Marko Tibold
e44f182fcf typos 2011-12-30 18:52:15 +01:00
Marko Tibold
e82ab8ea31 Added a simple example of how to use urllib and urllib2 to interact 
with an api.
 2011-12-30 18:46:18 +01:00
Tom Christie
2394fc70d1 And add RequestContext too 2011-12-30 16:38:03 +00:00
Tom Christie
c81c0d843e Fixes #102 2011-12-30 16:30:55 +00:00
Tom Christie
fd449204c1 Fixup for epio 2011-12-30 15:51:06 +00:00