encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 12:17:24 +03:00
Code Issues Packages Projects Releases Wiki Activity
714 Commits 18 Branches 132 Tags 104 MiB
44df8345f3
Commit Graph

152 Commits

Author SHA1 Message Date
Tom Christie
44df8345f3 Merge with master 2012-04-11 15:28:57 +01:00
Tom Christie
44b5d61203 Fix broken tests 2012-02-25 19:02:26 +00:00
Tom Christie
1cde31c86d Massive merge 2012-02-25 18:45:17 +00:00
Shawn Lewis
98c16e6da8 Test for issue #178. 
This failing test shows that the serializer implementation breaks when a
related serializer is passed in via include rather than via fields.
 2012-02-23 16:28:01 -08:00
Tom Christie
e15494a172 Remove InstanceMixin auto-url magicks. 2012-02-23 09:21:01 +00:00
Tom Christie
2b59df004a reverse takes request as a kwarg for compatibility with django's reverse 2012-02-23 08:58:10 +00:00
Tom Christie
66eabe8bd1 Remove staticviews. Use standard login/logout 2012-02-21 22:50:41 +00:00
Tom Christie
5fd4c639d7 Merge master into develop 2012-02-21 20:57:36 +00:00
Tom Christie
ca9465f11e reverse gets it's own module 2012-02-21 20:47:55 +00:00
Tom Christie
af9e4f69d7 Merging master into develop 2012-02-21 20:12:14 +00:00
Daniel Izquierdo
a29ca6c2d0 Pass the request object to `reverse' in the reverse tests 2012-02-21 22:44:02 +09:00
Daniel Izquierdo
af4851f7a8 Move the new `reverse' function from urlresolvers to utils 2012-02-21 22:41:51 +09:00
Daniel Izquierdo
12e34814e9 Test the custom reverse() function instead of the one provided by Django 2012-02-21 22:41:51 +09: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
Paul Oswald
9c8ca51c78 Delete robots.txt, favicon.ico views; Move style to a new static namespace 2012-02-14 11:25:59 +09:00
Sébastien Piquemal
b33579a7a1 attempt at fixing the examples 2012-02-10 11:05:20 +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
Sébastien Piquemal
5bb6301b7f Response as a subclass of HttpResponse - first draft, not quite there yet. 2012-02-02 18:19:44 +02:00
Sébastien Piquemal
5f59d90645 merged with trunk's master 2012-02-02 08:39:15 +02:00
Tom Christie
c7a8056034 Use named args in mixin tests. 2012-01-29 13:20:03 +00: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
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
Sébastien Piquemal
8b72b7bf92 corrected request example 2012-01-24 19:16:41 +02:00
Ben Timby
7fa3a214fb Refactored get_name()/get_description() 2012-01-23 13:32:37 -05:00
Ben Timby
2d8739115c Fix for testcase test_with_content_type_args 2012-01-23 13:18:38 -05:00
Tom Christie
8bb427537c Docstring tidy up 2012-01-23 09:06:30 +00:00
Tom Christie
e362344fbd Fix tests to work on all supported configurations. 2012-01-22 20:19:34 +00:00
Sébastien Piquemal
ab0b72a7c1 .DATA, .FILES, overloaded HTTP method, content type and content available directly on the request - see #128 2012-01-22 21:28:34 +02:00
Tom Christie
add6c88a26 Merge https://github.com/mjumbewu/django-rest-framework 2012-01-21 17:58:06 +00:00
Tom Christie
c94423151b Drop short status codes. 2012-01-21 17:55:25 +00:00
Tom Christie
a99a449c88 Add test for PUT with session auth+csrf 2012-01-21 17:47:33 +00:00
Mjumbe Wawatu Poe
417eacb2ed Add a get_object method to the ModelMixin, and tests 2012-01-20 13:05:44 -05:00
Tom Christie
a8ed7f9189 Merge pull request #130 from flashingpumpkin/master 
Added an additional attribute `unknown_form_fields` to `FormResource`
 2012-01-19 10:55:31 -08:00
Alen Mujezinovic
ec5badf739 Renamed unknown_form_fields to allow_unknown_form_fields 2012-01-19 15:52:26 +00:00
Ben Timby
0a5ca000ed Docstring/whitespace fixes. 2012-01-18 22:59:30 -05:00
Alen Mujezinovic
0a167a54fd Added an additional attribute unknown_form_fields to FormResource 
If the attribute is set to `True`, the validation method will not
raise an `ErrorResponse` with status 400 but silently strip out
unexpected fields on the form and only return the validated data.
 2012-01-17 11:01:32 +00:00
Marko Tibold
5f4096ca28 py25, py26 along with Django12 can't handle assertDictEqual (it was introduced 
in py27)
 2012-01-13 23:01:16 +01:00
Marko Tibold
905dd2ed9d Got rid of more duplicate tests and put back the tests for #122. 2012-01-13 21:57:49 +01:00
Michele Lazzeri
21776c0de2 split renderer and parser complex data test case 2012-01-13 10:11:34 +01:00
Michele Lazzeri
1bec6f2d5e add testcate XMLRendererTestCase.test_render_and_parse_complex_data 2012-01-12 18:04:18 +01:00
Tom Christie
ed8b296e75 Added test_ugettext_lazy test. Refs #87. 2012-01-11 16:16:22 +00:00
Tom Christie
c995ab397c Made suggested cleanups. Refs #121. 2012-01-11 14:56:12 +00:00
Tom Christie
e8ddbf435c Merge pull request #121 from sebpiq/issue-73 
Fixes #73.
Thanks @sebpiq, @ekohl!
 2012-01-11 06:53:32 -08:00