Sébastien Piquemal
c04cb5145c
merged with trunk
2012-02-14 10:10:04 +02:00
Sébastien Piquemal
821844bb11
fixed examples, corrected small bugs in the process
2012-02-14 10:05:28 +02:00
Paul Oswald
78daa32566
Move stylesheet references to the new relative namespace
2012-02-14 14:50:11 +09:00
Paul Oswald
9c8ca51c78
Delete robots.txt, favicon.ico views; Move style to a new static namespace
2012-02-14 11:25:59 +09:00
Tom Christie
ba1e3b4699
Fix typo.
2012-02-11 21:15:06 +00:00
Tom Christie
1ec165f38c
OPTIONS
is also a safe method.
2012-02-11 18:43:58 +00:00
Tom Christie
24911f37e4
Updated CHANGELOG. 'Added DjangoModelPermissions'.
2012-02-11 18:38:45 +00:00
Tom Christie
cb8d94b956
Improve docstring on DjangoModelPermissions, and also ensure the user is authenticated.
2012-02-11 18:29:24 +00:00
Tom Christie
2c11fd68f8
Minor name change
2012-02-11 17:48:35 +00:00
Tom Christie
88561a4ee2
Fix up DjangoModelPermissions.
2012-02-11 13:00:38 +00:00
Tom Christie
0e97074fd7
Merge pull request #160 from mammique/django_perms
...
Django perms
2012-02-11 04:33:34 -08:00
Camille Harang
963d2ecccb
DjangoModelPermisson's desc
2012-02-11 02:02:42 +01:00
Camille Harang
b236241982
check authentication after checking ModelResource
2012-02-11 01:54:28 +01:00
Camille Harang
bc80eb266f
DjangoModelPermisson
2012-02-11 01:49:28 +01:00
Sébastien Piquemal
b33579a7a1
attempt at fixing the examples
2012-02-10 11:05:20 +02:00
Sébastien Piquemal
db0b01037a
made suggested fixes
2012-02-10 10:18:39 +02:00
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