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 |
|
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 |
|
Markus Törnqvist
|
e2d3aa65d7
|
Move and rename LabelModelSerializer for further reuse
|
2013-05-18 16:56:26 +03:00 |
|
Tom Christie
|
80a2600891
|
Styling tweaks
|
2013-05-18 14:55:48 +01:00 |
|
Markus Törnqvist
|
e7ddaf5472
|
Turns out label and help_text are not always there
|
2013-05-18 16:50:59 +03: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 |
|