encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 02:53:58 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,545 Commits 18 Branches 132 Tags 105 MiB
75b2afcb23
Commit Graph

2545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
aeeb68f68a Added @j4mie, and added projects to 'additional thanks' as appropriate. 2012-09-28 10:42:14 +01:00
Tom Christie
549d50b956 More simple travis link style 2012-09-28 10:11:29 +01:00
Tom Christie
62ccc1a306 Fix failing tests 2012-09-28 10:11:12 +01:00
Tom Christie
ee36e4ab0c Only display forms when user has permissions. #159 2012-09-27 21:51:46 +01:00
Tom Christie
b2259bad6b Merge pull request #270 from phobologic/master 
Prevent serialization from recursing to self
 2012-09-27 05:49:34 -07:00
Tom Christie
49d2ea7cc0 Remove erronous checkins 2012-09-27 13:47:06 +01:00
Tom Christie
689d2afd97 Breadcrumbs play nicely when app not installed at root URL. Fixes #211 2012-09-27 13:46:20 +01:00
Tom Christie
4d906938a9 Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-09-27 13:34:48 +01:00
Tom Christie
284a700e09 head method on views for Django 1.3. Fixes #228 2012-09-27 13:34:28 +01:00
Tom Christie
8582b18ac4 Added @cyberj. Thanks! 2012-09-27 14:29:14 +02:00
Tom Christie
f3e7acde14 Rename category_dir to relative_dir 2012-09-27 14:27:40 +02:00
Tom Christie
049452d906 Merge pull request #271 from cyberj/restframework2 
Fix mkdocs bug with relative/abs path
 2012-09-27 05:25:58 -07:00
Tom Christie
d2583b809c Remove parse_qs from compat, now py2.5 support is dropped 2012-09-27 13:08:57 +01:00
Tom Christie
89a0b22306 Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-09-27 13:06:34 +01:00
Tom Christie
91b3fb0b05 Remove RequestFactory from compat (Now 1.2 is not supported) 2012-09-27 13:06:04 +01:00
Tom Christie
ec3c0c288b Add py27 to tox 2012-09-27 13:01:49 +01:00
Tom Christie
fe666a14ee Add test for request.POST 2012-09-27 12:50:18 +01:00
Tom Christie
3bae2867e9 Remove braindead test 2012-09-27 12:49:33 +01:00
Tom Christie
061cffb67b Added citation to contributing docs 2012-09-27 12:49:08 +01:00
Charpentier Johan
efe26e3a32 Improve changes with upstream's advices 2012-09-27 13:43:35 +02:00
Tom Christie
da1f6df4fa Added @LaundroMat. Thanks! 2012-09-26 23:07:59 +02:00
Tom Christie
0cc7030aab Fix @api_view decorator tests 2012-09-26 21:47:19 +01:00
Tom Christie
622e001e0b Merge pull request #261 from j4mie/improved-view-decorators 
First stab at new function-based view decorators
 2012-09-26 13:10:01 -07:00
Jamie Matthews
686a034817 No need to use setattr 2012-09-26 20:18:57 +01:00
Tom Christie
d3e0ac864f Fix broken import 2012-09-26 21:15:24 +02:00
Charpentier Johan
eb9920ac38 Fix bug with relative/real path 2012-09-26 17:02:44 +02:00
Jamie Matthews
c13c8fe5bc Update to new rest_framework package name, simplify implementation 2012-09-26 13:52:29 +01:00
Jamie Matthews
4be937a9b3 Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators 
* 'restframework2' of git://github.com/tomchristie/django-rest-framework:
  Add missing comma
 2012-09-26 13:09:39 +01:00
Tom Christie
ffe2c6d558 Add missing comma 2012-09-26 13:09:20 +01:00
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
09a445b257 Bits of cleanup 2012-09-26 12:40:11 +01:00
Tom Christie
728e92f06a Add request.QUERY_PARAMS 2012-09-26 12:39:39 +01:00
Tom Christie
6fc5581a8f Add readonly 'id' field 2012-09-25 13:40:16 +01:00
Tom Christie
758bcf5b1e Tweak browseable API 2012-09-25 13:35:41 +01:00
Tom Christie
b7b7ca5af9 Don't display readonly fields 2012-09-25 13:35:28 +01:00
Tom Christie
e0913e29b8 Fix some bits of serialization 2012-09-25 13:20:12 +01:00
Tom Christie
4fb57d28e6 Add csrf note 2012-09-25 12:27:46 +01:00
Tom Christie
921c5840aa Fix incorrect bit of tutorial 2012-09-25 12:21:35 +01:00
Tom Christie
d68684e26e Added tox.ini 2012-09-25 12:21:05 +01:00
Tom Christie
064e1ba91f Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing 2012-09-21 13:16:08 +01:00
Tom Christie
3f7371c796 Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing 2012-09-21 13:15:31 +01:00
Tom Christie
b4cd699b75 Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing 2012-09-21 13:12:10 +01:00
Tom Christie
d9cba6398e Clean up bits of templates etc 2012-09-20 17:44:34 +01:00
Tom Christie
f4670c8996 Hack out bunch of unneccesary private methods on View class 2012-09-20 14:00:53 +01:00
Tom Christie
5a82aa9726 Clean up template tags 2012-09-20 13:42:46 +01:00
Tom Christie
7efc6e8205 Remove dumbass __all__ variables 2012-09-20 13:22:07 +01:00
Tom Christie
87dae4d854 Remove old 'djangorestframework directories 2012-09-20 13:19:43 +01:00
Tom Christie
4b691c4027 Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +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
79df8eba2f Merge pull request #269 from tomchristie/fix_breadcrumbs 
Use get_script_prefix to play nicely if not installed at the root.
 2012-09-20 04:34:29 -07:00