Commit Graph

522 Commits

Author SHA1 Message Date
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
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
Marko Tibold
0bf89f267e Merge remote-tracking branch 'upstream/master' 2011-12-30 16:40:06 +01:00
Marko Tibold
b137b5ee56 Merge remote-tracking branch 'upstream/master' 2011-12-30 16:35:22 +01:00
Tom Christie
615e8d7e77 Added @yandy. Thanks! 2011-12-30 15:34:39 +00:00
Tom Christie
b8bfebc837 ep.io fixes 2011-12-30 15:33:14 +00:00
Tom Christie
904f197474 Replace field-errors with field_errors 2011-12-30 15:33:13 +00:00
Tom Christie
da42c4fe87 Merge pull request #101 from yandy/pub
change the key name "field-errors" to "field_errors".
2011-12-30 07:31:46 -08:00
Marko Tibold
28f1b027aa Merge remote-tracking branch 'origin/master' 2011-12-30 16:17:12 +01:00
Marko Tibold
b297325369 Merge remote-tracking branch 'upstream/master' 2011-12-30 16:14:39 +01:00
Marko Tibold
abf0ee8b97 some more refactoring and some style enhancements. Just committing
to stay in sync.
2011-12-30 16:13:24 +01:00
Marko Tibold
a1d31c8a3a drop linkchecking 2011-12-30 16:01:15 +01:00
Michael Ding
c7b9100f19 change the key name "field-errors" to "field_errors".
as "-" is not allowed as a part of key name in javascript
2011-12-30 22:52:01 +08:00
Tom Christie
ff9cb862d1 Keep it simple. 2011-12-30 13:06:57 +00:00