encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-11-04 01:47:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
907 Commits 16 Branches 134 Tags 128 MiB
01770c53cd
Commit Graph

188 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
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
b3e29d9576 Moved content negotiation out of response. Nicer exception handling now. 2012-09-14 22:42:29 +01:00
Jamie Matthews
21b1116af5 First stab at new view decorators 2012-09-14 16:07:07 +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
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
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
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
Mjumbe Wawatu Poe
3b1404bd7d Rename the default token class to "BasicToken" 2012-09-07 14:23:53 -04:00
Mjumbe Wawatu Poe
7f98741939 Use "Token" as the scheme for token auth 2012-09-07 14:07:35 -04:00
Mjumbe Wawatu Poe
5a3874ee11 Create a key by default if none is specified 2012-09-07 13:15:24 -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
bd28e43ce4 Remove dumbass meaningless test 2012-09-07 13:39:36 +01:00
Tom Christie
1c78bf53db Refactoring some basics 2012-09-06 13:49:15 +01:00
Tom Christie
c28b719333 Refactored throttling 2012-09-04 21:58:35 +01:00
Tom Christie
8457c87196 Bits of cleanup 2012-09-04 12:02:05 +01:00
Tom Christie
a092a72844 View -> APIView 2012-09-03 16:54:17 +01:00
Tom Christie
7abef9ac3b Parsers may return raw data, or a DataAndFiles object 2012-09-03 14:28:40 +01:00
Tom Christie
a25b4be441 Support generators 2012-09-03 13:30:20 +01:00
Tom Christie
ecd3733c5e Added serializers and fields 2012-08-28 15:46:38 +01:00
Tom Christie
73cc77553e Drop ImmediateResponse 2012-08-26 23:06:52 +01:00
Tom Christie
aed26b218e Drop out resources & mixins 2012-08-24 22:11:00 +01:00
Tom Christie
87b363f7bc Remove PermissionsMixin 2012-08-24 20:57:10 +01:00
Tom Christie
4e4584a01a Remove RequestMixinx / ReponseMixin 2012-08-24 20:50:24 +01:00
Tom Christie
4739e1c012 Merge work from sebpiq 2012-04-11 17:38:47 +01:00
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
Sébastien Piquemal
afd490238a authentication refactor : request.user + tests pass 2012-02-23 22:47:45 +02: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
Sébastien Piquemal
9da1ae81dc merged + fixed broken test 2012-02-23 09:01:33 +02:00
Sébastien Piquemal
242327d339 hack to fix ImmediateResponse rendering 2012-02-23 08:54:25 +02: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