Commit Graph

2742 Commits

Author SHA1 Message Date
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
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
Pablo Recio
50ba26822d Merge branch 'master' into 675-empty-label-related-field 2013-05-18 16:11:06 +02:00
Andy McKay
aeba5bed05 startswith can take a tuple 2013-05-18 07:09:24 -07:00
Stephan Groß
b7176065a9 Update getattr 2013-05-18 16:06:30 +02:00
Tom Christie
ea9a3d88bc Merge pull request #859 from craigds/master
fix for #765
2013-05-18 07:06:21 -07:00
Tom Christie
80a2600891 Styling tweaks 2013-05-18 14:55:48 +01:00
Tom Christie
794413734f Merge branch 'master' of https://github.com/mmcardle/django-rest-framework into styling-fixes 2013-05-18 14:50:49 +01:00
Stephan Groß
eb9fdd04fc Remove unused var 2013-05-18 15:50:12 +02:00
Stephan Groß
e6409bbc83 Temp commit for branch change ;-) 2013-05-18 15:48:36 +02:00
Tom Christie
2e8ff4473b Tweak docs 2013-05-18 14:47:39 +01:00
Tom Christie
c8dc5b691b Merge pull request #856 from grimborg/http_debug_error_page_doc
added comment about error behavior with DEBUG=True
2013-05-18 06:45:59 -07:00
Tom Christie
304c07681d Merge 2013-05-18 14:45:06 +01:00
Ryan Kaskel
ef383d969c Clean up test case. 2013-05-18 14:31:29 +01:00
Craig de Stigter
208bd991da when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765 2013-05-18 15:23:43 +02:00
Ryan Kaskel
22874e441d Merge latest changes from master. 2013-05-18 14:17:50 +01:00
Stephan Groß
a71acc76d8 Fix for #710 2013-05-18 15:12:54 +02:00
Ryan Kaskel
0b84c5a0ac Merge latest changes from master. 2013-05-18 14:04:27 +01:00
Tom Christie
275bfa2320 Added @grimborg and @ryankask. Go Team. :) 2013-05-18 14:03:08 +01:00
Pablo Recio
392c8556ae Display an empty label into related fields if it isn't required 2013-05-18 15:01:58 +02:00
Oscar Vilaplana
4dbf2d907f added comment about error behavior with DEBUG=True 2013-05-18 14:55:55 +02:00
Mark McArdle
72bc5a3556 documentation for https://github.com/tomchristie/django-rest-framework/issues/775 2013-05-18 13:19:13 +01:00
Mark McArdle
50a8f114fc Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2013-05-18 13:12:30 +01:00
Ryan Kaskel
770ed3de2e ToMany fields default to read-only if targeting ManyToManyField. 2013-05-18 13:11:40 +01:00
Mark McArdle
611919aa0a Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775 2013-05-18 13:10:05 +01:00
Tom Christie
a0e3c44c99 Added @craigds, @pyriku, @brianz - Yay for sprints! 2013-05-18 13:40:20 +02:00
Tom Christie
6d425aa3be Merge pull request #831 from brianz/master
Allow nested fields to be missing
2013-05-18 04:36:00 -07:00
Tom Christie
0c95405ea7 Merge pull request #853 from pyriku/725-blank-choice-dash
Adds BLANK_CHOICE_DASH as a choice item
2013-05-18 04:24:16 -07:00
Pablo Recio
8fe43236a2 Moved test model into closer to the testcase 2013-05-18 13:23:38 +02:00
Pablo Recio
53a8004401 Merge branch 'master' into 725-blank-choice-dash
Conflicts:
	rest_framework/tests/fields.py
2013-05-18 12:51:40 +02:00
Pablo Recio
ab8bd566f9 Adding BLANK_CHOICE_DASH as a choice if the model's field isn't required 2013-05-18 12:41:52 +02:00
Tom Christie
2a3056d038 Merge pull request #851 from linovia/master
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
2013-05-18 03:40:38 -07:00
Pablo Recio
de5cc8de42 A model's field is required if is null or blank 2013-05-18 12:40:25 +02:00