Commit Graph

350 Commits

Author SHA1 Message Date
Tom Christie
af9e4f69d7 Merging master into develop 2012-02-21 20:12:14 +00:00
Tom Christie
21fcd3a906 Some cleanup 2012-02-20 09:36:03 +00:00
Tom Christie
fbf76c87af Merge git://github.com/sebpiq/django-rest-framework into develop 2012-02-17 09:19:13 +00:00
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
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
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
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
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
15fc26f50b Fix up packaging and staticfiles changes. Fixes #155. Fixes #153. Fixes #150. 2012-02-07 08:58:15 +00: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
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
Tom Christie
b2fcfffb3b django-staticfiles for Django 1.2 compatability 2012-01-31 09:05:52 +00:00
Tom Christie
50c359c551 Refs #148 2012-01-30 15:54:38 +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
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
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
Tom Christie
c1fe5da85f Refactoring get_name/get_description 2012-01-25 20:39:01 +00:00
Tom Christie
f5e54c7c32 Merge remote-tracking branch 'btimby/description' 2012-01-25 19:53:04 +00:00
Sébastien Piquemal
152c385f4d enhanced request how-to + example 2012-01-25 00:11:54 +02:00
Tom Christie
df07616c6c Merge pull request #144 from btimby/master
Fix test_with_content_type_args to pass regardless of JSON library idiosyncracies
2012-01-24 12:25:32 -08:00
Ben Timby
d3ec860dd1 Modified test case to pass regardless of JSON library 2012-01-24 14:36:34 -05:00
Ben Timby
54caf6d7ba Modified test case to pass regardless of JSON library 2012-01-24 14:34:29 -05:00
Tom Christie
1d9f24f60d Fix UserLoggedInAuthentication for POST requests.
Fixes #78.
2012-01-24 19:26:37 +00:00
Sébastien Piquemal
714a90d755 documentation for request module 2012-01-24 21:21:10 +02:00
Ben Timby
049d417ebc Reverted formatting 2012-01-24 14:11:10 -05:00
Tom Christie
863bbe7684 Parse url when adding query param. 2012-01-24 18:13:01 +00:00