aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-01-11recursive xml parsingMichele Lazzeri
2012-01-11Revert "update author"Michele Lazzeri
This reverts commit f461acbaf28aa79d82cffaf65b886c3d884cc5f4.
2012-01-11update authorMichele Lazzeri
2012-01-11Replace 'x.has_key(y)' with 'y in x'Tom Christie
2012-01-11Added test_ugettext_lazy test. Refs #87.Tom Christie
2012-01-11Made suggested cleanups. Refs #121.Tom Christie
2012-01-11Merge pull request #121 from sebpiq/issue-73Tom Christie
Fixes #73. Thanks @sebpiq, @ekohl!
2012-01-11Added @dzen. Thanks!Tom Christie
2012-01-11Remove explicit handling of 'OPTIONS' method, just raise the response, ↵Tom Christie
rather than returning it.
2012-01-11Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2012-01-11Some minor tidy upTom Christie
2012-01-11Merge https://github.com/dzen/django-rest-frameworkTom Christie
2012-01-11Added @sebzur - Thanks!Tom Christie
2012-01-11Minor cleanup on ModelMixinTom Christie
2012-01-11Merge https://github.com/sebzur/django-rest-frameworkTom Christie
2012-01-11Refactor add_query_param to use URLObject. Refs #112.Tom Christie
2012-01-11Replace tab with spaces.Tom Christie
2012-01-11Use safe_dump. Fixes #123.Tom Christie
2012-01-11fixes #122Marko Tibold
tahanks @remcogerlich
2012-01-10QueryMixin to ModelMixin rename.Sebastian Żurek
2012-01-10fixed issue#73 and added a testSébastien Piquemal
2012-01-10Merge branch 'master' of https://github.com/dzen/django-rest-frameworkBenoit C
Conflicts: djangorestframework/views.py
2012-01-10Add test for final() methodBenoit C
2012-01-10Introduce a final methods in View classBenoit C
2012-01-09Introduce a final methods in View classBenoit C
2012-01-09Make a nested if flatEwoud Kohl van Wijngaarden
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-08QueryMixin class updates (comments + docs and the definition of ↵Sebastian Żurek
get_instance_data method)
2012-01-05Added URLObjectTom Christie
2012-01-05Merge pull request #111 from j4mie/url-generationTom Christie
Preserve existing query params in PaginatorMixin
2012-01-05Preserve existing query params in PaginatorMixinJamie Matthews
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-04Merge pull request #109 from jakul/bare_except_stmtsMarko Tibold
Change 'except' for 'except Exception' (Fixes issue #75)
2012-01-04#75 remove except statements which are overly broad in the exception they catchCraig Blaszczyk
2012-01-04Twitter handleTom Christie
2012-01-04Don't raise when in compat mode, just pass.Marko Tibold
2012-01-04Fix indentationMarko Tibold
2012-01-04We can now use @unittests.skipMarko Tibold
2012-01-040.3.2-devTom Christie
2012-01-04Added @natim, @mjumbewu - Thanks :)0.3.1Tom Christie
2012-01-04Version 0.3.1Tom Christie
2012-01-04Merge pull request #108 from mjumbewu/patch-1Tom Christie
Only set the script_prefix if the prefix isn't already a full URL.
2012-01-04Only set the script_prefix if the prefix isn't already a full URL.Mjumbe Poe
2012-01-03QueryMixin created + related mixins updatesSebastian Żurek
2012-01-02Merge remote-tracking branch 'upstream/master'Marko Tibold
2012-01-02minor style editsMarko Tibold
2012-01-02Add 1.4Tom Christie
2012-01-02Add 1.4.Tom Christie
2012-01-02Rename examples in tox.Tom Christie
2012-01-02Rename examples in tox.Tom Christie
2012-01-02Drop mercurial reference.Tom Christie
2012-01-02:mod: directive is nicer hereMarko Tibold