Commit Graph

849 Commits

Author SHA1 Message Date
Alec Perkins
69ad8b9000 Inverse, fixed navbar. Block for easily modifying navbar style. 2012-09-09 15:54:50 -04:00
Alec Perkins
33c1e5b5ba Add horizontal scrolling to pre blocks. 2012-09-09 15:37:53 -04:00
Alec Perkins
ab9621ed81 Add prettify syntax highlighting to resource info. 2012-09-09 15:30:35 -04:00
Alec Perkins
8c0bd39f12 Styling of POST, PUT forms. Add add_class filter. 2012-09-09 15:17:44 -04:00
Alec Perkins
4500103337 Merge 'tomchristie/restframework2' into 'browsable-bootstrap' 2012-09-09 13:23:07 -04:00
Alec Perkins
0ae5500f34 Compacting, moving GET button up to OPTIONS 2012-09-09 12:44:21 -04: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
Alec Perkins
1755c7a96c Add block around Bootstrap styles for easy theming.
Instead of overriding the theme in the `extra_style` block, it can be replaced directly. This avoids having to load unnecessary styles.
2012-09-08 15:51:08 -04:00
Tom Christie
5d9dfcd8ae Code highlighting in docs 2012-09-08 20:23:32 +01:00
Alec Perkins
8b749d0300 Whoops, forgot the extrabody block. 2012-09-08 12:51:19 -04:00
Marko Tibold
024780a974 Fields are showing up again. Still WIP. 2012-09-08 18:18:05 +02:00
Alec Perkins
6ff8967e19 Disable non-functional methods 2012-09-08 11:40:02 -04:00
Alec Perkins
422ee696ab Minor style adjustment 2012-09-08 11:39:30 -04: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
Alec Perkins
4cc3dd3b23 Disable OPTIONS if method isn't allowed 2012-09-08 00:40:11 -04: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
Alec Perkins
94029acd28 Add information about the request.
Add link in footer for some visual balance.
Tighten up styling.
2012-09-07 19:05:59 -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
Alec Perkins
27598fc5f4 Missing status code in .txt version of API 2012-09-07 18:01:17 -04:00
Tom Christie
80c50bfd2d Merge pull request #252 from markotibold/docs-fixes
Some minor docs fixes
2012-09-07 14:12:32 -07:00
Alec Perkins
9ded9d232c Add tooltips to other methods 2012-09-07 17:10:13 -04: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
Alec Perkins
c499fa0010 Apply Bootstrap to in-page request forms.
Includes tooltips using the title attributes.
2012-09-07 16:50:17 -04:00
Alec Perkins
338479ffbd Applying Bootstrap to breadcrumbs, page header 2012-09-07 16:48:52 -04: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
Alec Perkins
54cc93a813 Rework nav to use Bootstrap's Navbar. 2012-09-07 16:09:28 -04:00
Alec Perkins
5043b9f656 Add in Bootstrap to browsable API base template. Strip out admin-clone styles.
No real markup changes yet, just swapping libraries in & out.
2012-09-07 15:58:38 -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
e077b0e519 Change browsable API base template to HTML5 doctype, required by Bootstrap. 2012-09-07 14:33:07 -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