Alen Mujezinovic
add5f32e8a
Merge remote branch 'tomchristie/master'
2012-02-09 11:13:42 +00:00
Sébastien Piquemal
2cdff1b01e
modified examples, somethin' still broken, can't find what
2012-02-07 16:52:15 +02:00
Sébastien Piquemal
6963fd3623
some docs for Request/Response/mixins
2012-02-07 16:22:14 +02:00
Sébastien Piquemal
21292d31e7
cleaned Request/Response/mixins to have similar interface
2012-02-07 15:38:54 +02:00
Tom Christie
c5691cca0e
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2012-02-07 11:23:03 +00:00
Tom Christie
cbac9244ac
Use app for Django 1.2
2012-02-07 11:22:47 +00:00
Sébastien Piquemal
ca96b4523b
cleaned a bit Response/ResponseMixin code, added some documentation + renamed ErrorResponse to ImmediateResponse
2012-02-07 13:15:30 +02:00
Tom Christie
5b7c8658ba
Merge pull request #156 from j4mie/duplicate-page-param
...
Ensure duplicate "page" parameters are not created
2012-02-07 03:14:08 -08:00
Jamie Matthews
76a7d35813
Ensure duplicate "page" parameters are not created
...
Previously, URLObject.add_query_param was used to generate
next/previous page links in PaginatorMixin. This resulted
in (for example) page 2's "next" link having the params:
?page=2&page=3
Instead, URLObject.set_query_param should be used to replace
the current value of the "page" parameter.
2012-02-07 11:08:55 +00:00
Tom Christie
0f49f9b2b5
In examples settings, use staticfiles for 1.2, django.contrib.staticfiles otherwise
2012-02-07 11:01:43 +00:00
Tom Christie
6207791af1
Attempt to stop banging head against brick wall.
2012-02-07 10:14:34 +00:00
Tom Christie
8c1e6beb85
Distutils, you are a harsh master.
2012-02-07 09:55:01 +00:00
Tom Christie
f2f8527af2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2012-02-07 09:47:44 +00:00
Tom Christie
304c995983
Fix distutils errors
2012-02-07 09:47:15 +00:00
Tom Christie
15edc88e70
Tweak
2012-02-07 09:31:08 +00:00
Tom Christie
25b6718111
Tweak
2012-02-07 09:30:08 +00:00
Tom Christie
ee2c8606af
Tweaks.
2012-02-07 09:29:48 +00:00
Tom Christie
15fc26f50b
Fix up packaging and staticfiles changes. Fixes #155 . Fixes #153 . Fixes #150 .
2012-02-07 08:58:15 +00:00
Tom Christie
87ef85587d
Update AUTHORS
2012-02-02 16:31:40 +00:00
Sébastien Piquemal
a0dc0b10e5
merge
2012-02-02 18:21:42 +02:00
Sébastien Piquemal
5bb6301b7f
Response as a subclass of HttpResponse - first draft, not quite there yet.
2012-02-02 18:19:44 +02:00
Tom Christie
bd25e99f15
Python docs say inherit from Exception, not BaseException.
2012-02-02 09:05:28 +00:00
Tom Christie
1224bb6bb7
Merge pull request #151 from mammique/master
...
* should be ** in mixins's self.get_instance(*
2012-02-01 23:59:41 -08:00
Sébastien Piquemal
5f59d90645
merged with trunk's master
2012-02-02 08:39:15 +02:00
Camille Harang
da8187d2c2
* -> **
2012-02-01 23:56:54 +01:00
Tom Christie
894f632598
Remove use of Q objects.
2012-02-01 20:48:32 +00:00
Tom Christie
7886fa2b16
Update test settings for 1.2
2012-02-01 20:24:45 +00:00
Sébastien Piquemal
279fa0d371
merge
2012-01-31 23:21:55 +02:00
Tom Christie
b2fcfffb3b
django-staticfiles for Django 1.2 compatability
2012-01-31 09:05:52 +00:00
Marko Tibold
497d6df5e5
Fix typo.
2012-01-30 21:24:20 +01:00
Marko Tibold
39d4a39441
renamed to CHANGELOG.rst and included release notes in index.rst
2012-01-30 18:29:54 +01:00
Tom Christie
243d80ccb0
Django 1.2 needs django-staticfiles
2012-01-30 16:05:13 +00:00
Tom Christie
50c359c551
Refs #148
2012-01-30 15:54:38 +00:00
Tom Christie
9746bb34cc
Update RELEASES
2012-01-30 14:14:48 +00:00
Tom Christie
278b3576f3
Fixes #148 . Thanks @dvinegla.
2012-01-30 14:13:57 +00:00
Tom Christie
c7a8056034
Use named args in mixin tests.
2012-01-29 13:20:03 +00:00
Marko Tibold
289e421543
Add Michele's full name.
2012-01-29 13:46:04 +01:00
Tom Christie
f115be29e0
Latest changelog.
2012-01-28 19:10:07 +00:00
Tom Christie
c0674e36d4
Drop implicit 'pk' on last arg in urlconf. (Too magical).
2012-01-28 19:06:40 +00:00
Tom Christie
765ec0b76e
Use staticfiles
for serving css. Fixes #116 .
2012-01-28 18:54:02 +00:00
Tom Christie
f34ed6d1f3
0.3.2 Release notes
2012-01-28 17:45:13 +00:00
Tom Christie
22ee89f0f3
Tidy up auto-escaping.
2012-01-28 14:38:11 +00:00
Marko Tibold
bbfa404e46
Fix silly error. This makes more sense.
2012-01-28 15:27:06 +01:00
Marko Tibold
cc226e7e67
moving forward
2012-01-28 14:06:34 +01:00
Marko Tibold
a9e0159481
prepare for tagging
2012-01-28 13:38:29 +01:00
Marko Tibold
76a8c11cf1
Preparing release notes for taggging and uploading to pypi.
2012-01-28 13:37:47 +01:00
Marko Tibold
7af16dc762
Thanks @michelelazzzeri-nextage, if you give your full name, it will be listed here explicitly.
2012-01-28 12:47:16 +01:00
Marko Tibold
cb6f62b2af
fixes #146
...
rest.ep.io now runs tip.
2012-01-27 20:45:53 +01:00
Alen Mujezinovic
dd680d7a0a
Added get_renderers method to ResponseMixin
2012-01-27 12:56:05 +00:00
Tom Christie
c1fe5da85f
Refactoring get_name/get_description
2012-01-25 20:39:01 +00:00