encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 08:00:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
909 Commits 18 Branches 132 Tags 111 MiB
4be937a9b3
Commit Graph

496 Commits

Author SHA1 Message Date
Jamie Matthews
01770c53cd Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators 
* 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits)
  Bits of cleanup
  Add request.QUERY_PARAMS
  Add readonly 'id' field
  Tweak browseable API
  Don't display readonly fields
  Fix some bits of serialization
  Add csrf note
  Fix incorrect bit of tutorial
  Added tox.ini
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Clean up bits of templates etc
  Hack out bunch of unneccesary private methods on View class
  Clean up template tags
  Remove dumbass __all__ variables
  Remove old 'djangorestframework directories
  Change package name: djangorestframework -> rest_framework
  Dont strip final '/'
  Use get_script_prefix to play nicely if not installed at the root.
  ...

Conflicts:
	rest_framework/decorators.py
 2012-09-26 13:05:21 +01:00
Tom Christie
87dae4d854 Remove old 'djangorestframework directories 2012-09-20 13:19:43 +01:00
Tom Christie
a1bcfbfe92 Merge pull request #266 from tomchristie/resources 
First pass at resources
 2012-09-20 04:34:49 -07:00
Tom Christie
cb8a8e98ed Dont strip final '/' 2012-09-19 18:48:59 +01:00
Tom Christie
9921b6bd73 Use get_script_prefix to play nicely if not installed at the root. 2012-09-19 17:14:40 +01:00
Tom Christie
cab556ee3f Initial resources code 2012-09-18 19:03:59 +01:00
Tom Christie
308677037f Tweak docs, fix .error_data -> .errors 2012-09-17 20:19:45 +01:00
Tom Christie
d8ede0355c Drop cronky tests 2012-09-16 22:00:05 +01:00
Tom Christie
a96211d3d1 Simplify negotiation. Drop MSIE hacks. Etc. 2012-09-16 21:48:55 +01:00
Tom Christie
6543ccd244 Cleaner content negotiation. Occurs after permissions. Optional 'force' flag. 2012-09-14 23:17:12 +01:00
Tom Christie
5036638d0c Simplify content_negotiation slightly 2012-09-14 22:52:28 +01:00
Tom Christie
b3e29d9576 Moved content negotiation out of response. Nicer exception handling now. 2012-09-14 22:42:29 +01:00
Tom Christie
b7b8cd11b1 Wrap more cleanly 2012-09-14 19:36:44 +01:00
Jamie Matthews
f6488cb058 Move logic for attaching HTTP handlers into LazyViewCreator 2012-09-14 16:40:08 +01:00
Jamie Matthews
21b1116af5 First stab at new view decorators 2012-09-14 16:07:07 +01:00
Tom Christie
a5213d4023 Drop urlobject2 2012-09-14 13:24:13 +01:00
Tom Christie
a2d0fd2c40 Merge stunning work from @alecperkins 2012-09-14 13:03:58 +01:00
Tom Christie
f204439fa8 Merge branch 'browsable-bootstrap' of https://github.com/droptype/django-rest-framework into droptype-browsable-bootstrap 2012-09-14 12:52:12 +01:00
Tom Christie
886f8b4751 Tweak throttles and improve docs 2012-09-14 08:54:58 +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
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
Alec Perkins
7098114ac7 Tweak the spacing of the form actions. 2012-09-09 16:09:11 -04:00
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
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
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
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
Alec Perkins
27598fc5f4 Missing status code in .txt version of API 2012-09-07 18:01:17 -04: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
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
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