encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-23 12:29:05 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,937 Commits 18 Branches 132 Tags 120 MiB
9e4e2c60f7
Commit Graph

2937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
4802177766 Enforce object permissions check when rendering forms in browseable API 2013-05-18 21:19:53 +01:00
Tom Christie
5ed3f59a2c Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-18 21:13:19 +01:00
Tom Christie
4631b91e14 Fix broken 'binary content' in browseable API 2013-05-18 21:12:44 +01:00
Nikolaus Schlemm
843ae60237 Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options 
Conflicts:
	rest_framework/tests/fields.py
 2013-05-18 18:34:21 +02:00
Tom Christie
351814e110 Added @lolek09 for work on #862. Kick ass! 2013-05-18 18:32:02 +02:00
Nikolaus Schlemm
7f1cc82f96 added unittests for permission check of exposing actions via OPTIONS 2013-05-18 18:29:51 +02:00
Oscar Vilaplana
fecadacab1 added tests for form 2013-05-18 18:27:53 +02:00
Tom Christie
d4721fc1f7 Correct charset on UnicodeJSONRenderer 2013-05-18 17:25:38 +01:00
Tom Christie
bac4bf6e95 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-18 17:22:27 +01:00
Tom Christie
0d3d66cb02 Added proper charset support 2013-05-18 17:21:43 +01:00
Oscar Vilaplana
4dffcb5d77 Added humanized field names and types 2013-05-18 18:10:17 +02:00
Tom Christie
6af61a19b7 Added @matteosuppo for work on #865. Thanks! 2013-05-18 18:07:43 +02:00
Tom Christie
1888f4a1f0 Merge pull request #865 from ryankask/issue-747-lazy-strings-serialized 
Issue 747 lazy strings serialized
 2013-05-18 09:05:42 -07:00
Ryan Kaskel
579f77ceaa Move function to compat. 2013-05-18 17:04:17 +01:00
Tom Christie
6d5cf527c3 Merge pull request #864 from minddust/fix_missing_min_values 
Fix missing min values
 2013-05-18 08:56:24 -07:00
Tom Christie
c7fd243533 Merge pull request #863 from pyriku/787-unicodejsonrenderer 
Adds UnicodeJSONRenderer
 2013-05-18 08:55:59 -07:00
Nikolaus Schlemm
5ab7cc6e6b HEAD and OPTIONS should not be exposed as actions as discussed in a42afa04c3 (commitcomment-3241476) 2013-05-18 17:38:47 +02:00
Markus Törnqvist
99848b0321 Drop another case of u'', this time from #530 code 2013-05-18 18:38:37 +03:00
Markus Törnqvist
1fd66fe8c6 Drop u'', it was used inconsistently and breaks for nothing with Python 3.2 2013-05-18 18:27:36 +03:00
Ryan Kaskel
33f702d306 Merge latest changes from master. 2013-05-18 16:26:17 +01:00
Ryan Kaskel
10e451a85a Handle Python 3 strings and lazy strings. 2013-05-18 16:21:18 +01:00
Stephan Groß
025c40e7d5 Fix order for applying min_value to fields 2013-05-18 17:16:29 +02:00
Nikolaus Schlemm
b225b1d5c9 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options 2013-05-18 17:13:59 +02:00
Markus Törnqvist
48c1b2233b Merge branch 'master' into mjtorn-master 
Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py

Fixed conflicts
 2013-05-18 18:13:31 +03:00
Nikolaus Schlemm
a42afa04c3 draft for fields' metadata via OPTIONS - needs review and decision 2013-05-18 17:13:23 +02:00
Nikolaus Schlemm
b4dbfa9832 only catch relevant exceptions ;) 2013-05-18 17:10:13 +02:00
Pablo Recio
b9b2297612 Tests proper encoding in JSONRenderer and UnicodeJSONRenderer 2013-05-18 17:06:54 +02:00
Pablo Recio
71e29644a2 Adds new renderer into the documentation 2013-05-18 17:06:54 +02:00
Pablo Recio
6dbbbc16da Better checking if the content can be printable in the BrowsableAPI 2013-05-18 17:06:54 +02:00
Pablo Recio
97f034e3d6 Adds UnicodeJSONRenderer which doesn't ensure ascii 2013-05-18 17:06:54 +02:00
Pablo Recio
c69f960066 Adding a class attribute into JSONRenderer for ensuring ascii, and using it consistently 2013-05-18 17:06:54 +02:00
Stephan Groß
0c81d04170 Add min_value=0 to autogenerated Pos..IntFields 2013-05-18 17:04:20 +02:00
Karol Majta
5bebd29f11 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2013-05-18 16:56:38 +02:00
Karol Majta
ebe959b52a charset param gets now appended to response's Content-Type. Closes #807 2013-05-18 16:45:05 +02:00
Markus Törnqvist
2795e842d6 Two test cases for html rendering of API with labelized model 2013-05-18 17:44:40 +03:00
Markus Törnqvist
e68ea16d7a Update FieldLabelTest to use new BasicModel.verbose_name 2013-05-18 17:43:47 +03:00
Markus Törnqvist
e2a5ec0350 Change BasicModel.verbose_name 
Isn't it nicer to test for a text which is different from
what the previous broken behavior was? Now we can really
tell it works!
 2013-05-18 17:42:56 +03:00
Tom Christie
3f47eb7a77 Merge pull request #861 from minddust/fix_missing_field_values 
Remove default values - django sets them for us - cause of #710
 2013-05-18 07:32:50 -07:00
Stephan Groß
6714b755f4 Fix missing para.. 2013-05-18 16:32:31 +02:00
Oscar Vilaplana
29739f78ba Merge branch 'issue-192-expose-fields-for-options' of github.com:nschlemm/django-rest-framework into http_debug_error_page_doc 2013-05-18 16:30:21 +02:00
Stephan Groß
aeea32030b Add newline 2013-05-18 16:27:11 +02:00
Tom Christie
5f8d353f0b Rename has_user_through_model -> has_through_model 2013-05-18 15:25:49 +01:00
Stephan Groß
9f9cb97d65 Add TestCases for default field values 2013-05-18 16:24:54 +02:00
Tom Christie
e1a3cab400 Merge pull request #854 from ryankask/issue-775 
All relations pointing to ManyToManyFields should default to read-only
 2013-05-18 07:22:22 -07:00
Nikolaus Schlemm
f8c1481d4b expose the fields metadata via OPTIONS as described in https://github.com/tomchristie/django-rest-framework/issues/192 
missing:
 - get fields for method (currently all the same)
 - tests
 - right placement of code
 2013-05-18 16:21:25 +02:00
Tom Christie
cc39b9c925 Merge pull request #858 from minddust/fix_710 
Fix for #710
 2013-05-18 07:19:52 -07:00
Tom Christie
3ba43b960e Added @andymckay for refactoring #860 2013-05-18 16:19:05 +02:00
Tom Christie
e32a6e4211 Merge pull request #860 from andymckay/master 
startswith can take a tuple
 2013-05-18 07:17:13 -07:00
Tom Christie
a2e2b0abda Merge pull request #857 from pyriku/675-empty-label-related-field 
Display an empty label into related fields if it isn't required
 2013-05-18 07:16:12 -07:00
Pablo Recio
7dca0e6859 Removed unicode literals 2013-05-18 16:12:48 +02:00