Commit Graph

839 Commits

Author SHA1 Message Date
Tom Christie
d8b5d6603e Tweak copy 2012-09-13 18:35:06 +01:00
Tom Christie
6c109ac60f Improve throttles and docs 2012-09-13 18:32:56 +01:00
Tom Christie
b16c45aa6d Tweak throttling/permissions/auth docs 2012-09-13 09:39:16 +01:00
Tom Christie
003a65f0e0 Tweaks to Token auth 2012-09-12 20:39:22 +01:00
Tom Christie
dac4cb9e8b GitHub link in toolbar 2012-09-12 13:11:26 +01:00
Tom Christie
2469cd2c83 Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-09-12 10:13:14 +01:00
Tom Christie
c85f799ade Updating docs 2012-09-12 10:12:13 +01:00
Tom Christie
381fdd17a7 Merge pull request #259 from j4mie/rename-properties
Better naming for properties on views, requests and responses
2012-09-11 06:30:28 -07:00
Jamie Matthews
272c49685c Better naming for properties on views, requests and responses
renderers is now renderer_classes
parsers is now parser_classes
authentication is now authentication_classes
2012-09-11 14:20:35 +01:00
Tom Christie
d4f8b4cf06 Collapsing menu, travis and github badges, horizontal scrolling code on overflow 2012-09-09 16:56:04 +01:00
Tom Christie
baa6e2c18b Hide toc overflow 2012-09-08 22:31:44 +01:00
Tom Christie
27a5109485 Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-09-08 22:13:48 +01:00
Tom Christie
b5e07abc15 Move quote below title for consistency 2012-09-08 22:13:11 +01:00
Tom Christie
a33c21764a Merge pull request #256 from markotibold/put-post-delete
Re-enable PUT/POST/DELETE in the browsable api
2012-09-08 14:10:29 -07:00
Tom Christie
247696e820 Links to source files in docs 2012-09-08 22:06:13 +01:00
Marko Tibold
ef0bf1e775 Fix failing test. 2012-09-08 22:50:54 +02:00
Marko Tibold
59a0bc55af Don't fill in the form after a DELETE. 2012-09-08 22:01:12 +02:00
Marko Tibold
55f7dd9bce error_data -> errors
Prefill form for instance view.
2012-09-08 21:56:18 +02:00
Tom Christie
5d9dfcd8ae Code highlighting in docs 2012-09-08 20:23:32 +01:00
Marko Tibold
024780a974 Fields are showing up again. Still WIP. 2012-09-08 18:18:05 +02:00
Tom Christie
382b277dfc Link to github accounts in credits 2012-09-08 08:41:31 +01:00
Tom Christie
79144919f6 Added @alecperkins. 2012-09-08 08:38:14 +01:00
Tom Christie
274420c658 Merge pull request #251 from mjumbewu/1.3-support
Fix Django 1.3 compatibility
2012-09-07 22:40:05 -07:00
Mjumbe Wawatu Poe
9c007a6197 Fix the tests on 1.3 and HEAD
In the latest Django master code, RequestFactory.put behaves fundamentally differently than it did pre-1.5.  By default, it expects an octet string as opposed to a dictionary that it will encode like a multipart form.  So, for 1.5 and on, we have to be explicit about the multipart type and pre-encode the data.  However, pre-1.5 Django expects a dictionary if the content type is multipart.  So, the cleanest thing to do is explicitly handle the versions independently.
2012-09-07 19:14:20 -04:00
Mjumbe Wawatu Poe
f729d0eb0b Fix Django master support.
- Explicitly encode PUT data as multipart, as Django 1.5 no longer does so by default in the test client
2012-09-07 18:45:23 -04:00
Tom Christie
8f119a8c34 Merge pull request #253 from droptype/rf2-docfixes
Fixes for the documentation styles
2012-09-07 15:25:58 -07:00
Tom Christie
80c50bfd2d Merge pull request #252 from markotibold/docs-fixes
Some minor docs fixes
2012-09-07 14:12:32 -07:00
Mjumbe Wawatu Poe
7d9125bcb6 Fix Django 1.3 compatibility 2012-09-07 17:05:21 -04:00
Marko Tibold
8ee763739d Add some missing imports.
Fix some typos.
Fix some indentation errors.
2012-09-07 22:53:02 +02:00
Tom Christie
9faca0aef0 Merge pull request #249 from mjumbewu/restframework2
Implement simple token authentication
2012-09-07 13:48:39 -07:00
Mjumbe Wawatu Poe
8df71f4d1d Get rid of the BaseToken abstract model 2012-09-07 16:19:15 -04:00
Mjumbe Wawatu Poe
f741cdae44 Move TokenAuthentication class into djangorestframework.authentication 2012-09-07 16:15:33 -04:00
Mjumbe Wawatu Poe
10450bafc9 Fix renderer tests.
- All MockViews return Response objects
- Only one urlpatterns attribute in the module
- Renamed `RendererIntegrationTests` to `RendererEndToEndTests`, as the former wasn't being run locally (but it was on Travis...dunno).
2012-09-07 15:45:34 -04:00
Alec Perkins
f95f96aba7 [docs] Fix typo, add link to Tom's Twitter profile 2012-09-07 14:31:24 -04:00
Mjumbe Wawatu Poe
3b1404bd7d Rename the default token class to "BasicToken" 2012-09-07 14:23:53 -04:00
Mjumbe Wawatu Poe
36cd91bbbe Update docs for tokenauth 2012-09-07 14:12:46 -04:00
Alec Perkins
7f681d72fc [docs] Update jQuery to 1.8.1 2012-09-07 14:12:29 -04:00
Mjumbe Wawatu Poe
7f98741939 Use "Token" as the scheme for token auth 2012-09-07 14:07:35 -04:00
Alec Perkins
aabb26e598 [docs] Add 'img' to static file processing. 2012-09-07 13:57:44 -04:00
Alec Perkins
30dedc95e5 [docs] Spacing tweaks when getting responsive. 2012-09-07 13:52:44 -04:00
Mjumbe Wawatu Poe
5a3874ee11 Create a key by default if none is specified 2012-09-07 13:15:24 -04:00
Alec Perkins
6d7d70c1c0 [docs] Move styles to own file. Fix table-of-contents positioning when viewed on <767px screens.
The fixed positioning of the ToC needs to be overridden with static, so that the ToC falls back into the flow of content and is sized correctly. Also, this prevents the actual page content from riding up behind the ToC and being obscured.
2012-09-07 13:05:44 -04:00
Alec Perkins
17654a8b54 [docs] Add bootstrap-collapse plugin, fixing collapsing navbar. 2012-09-07 13:01:30 -04:00
Alec Perkins
3306e448ef [docs] Update Bootstrap to 2.1.1 2012-09-07 13:01:01 -04:00
Mjumbe Wawatu Poe
f3e65eab6b Add a TokenAuthentication class in a sub-application 2012-09-07 12:53:39 -04:00
Tom Christie
72bdd0fcec Add basic serializer tests 2012-09-07 15:14:23 +01:00
Tom Christie
a01d615354 Add note re. browseable API and @api_view decorator 2012-09-07 13:55:02 +01:00
Tom Christie
bd28e43ce4 Remove dumbass meaningless test 2012-09-07 13:39:36 +01:00
Tom Christie
82056d8915 Add coverage to travis config 2012-09-07 13:35:57 +01:00
Tom Christie
07323d4cd6 Add travis config 2012-09-07 13:32:52 +01:00