Tom Christie
|
7a93fdbe0a
|
Last bits of charset sorting-out-ness
|
2013-05-22 16:46:15 +01:00 |
|
Tom Christie
|
17699056af
|
Use assertEqual, not assertEquals
|
2013-05-22 16:45:56 +01:00 |
|
Tom Christie
|
0c2b534d95
|
Minor cleanup
|
2013-05-22 09:29:43 +01:00 |
|
Tom Christie
|
06b28f66ed
|
Tweak method ordering for better consistency
|
2013-05-22 09:07:12 +01:00 |
|
Tom Christie
|
cdc3c37465
|
Merge and styling fixes
|
2013-05-21 12:01:56 +01:00 |
|
Tom Christie
|
aef7ac72cc
|
content type may be set explicitly on the response
|
2013-05-20 21:18:17 +01:00 |
|
Tom Christie
|
f19e0d544f
|
Fix charset issues
|
2013-05-20 21:00:56 +01:00 |
|
David Jones
|
c3fd7c6685
|
Updated SlugField to raise validation errors for invalid slugs
|
2013-05-20 13:04:38 +01:00 |
|
Tom Christie
|
7c945b43f0
|
Only use object permissions in browsable api form generation if an object exists
|
2013-05-18 23:52:02 +01:00 |
|
Tom Christie
|
4802177766
|
Enforce object permissions check when rendering forms in browseable API
|
2013-05-18 21:19:53 +01:00 |
|
Tom Christie
|
4631b91e14
|
Fix broken 'binary content' in browseable API
|
2013-05-18 21:12:44 +01: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 |
|
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 |
|
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 |
|
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 |
|
Pablo Recio
|
b9b2297612
|
Tests proper encoding in JSONRenderer and UnicodeJSONRenderer
|
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 |
|
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 |
|
Tom Christie
|
cc39b9c925
|
Merge pull request #858 from minddust/fix_710
Fix for #710
|
2013-05-18 07:19:52 -07:00 |
|
Tom Christie
|
e32a6e4211
|
Merge pull request #860 from andymckay/master
startswith can take a tuple
|
2013-05-18 07:17:13 -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 |
|
Stephan Groß
|
eb9fdd04fc
|
Remove unused var
|
2013-05-18 15:50:12 +02:00 |
|