Commit Graph

2749 Commits

Author SHA1 Message Date
Tom Christie
06b28f66ed Tweak method ordering for better consistency 2013-05-22 09:07:12 +01:00
Tom Christie
0e80a535fb Tweak nav style slightly 2013-05-21 17:45:25 +01:00
Tom Christie
6434a5f4a8 Added @mikee2185 and @mjtorn for their work on #467. Thank you :) 2013-05-21 12:12:39 +01:00
Tom Christie
ac99b81497 Note usage of django-filter 0.5.4 for Django 1.3 support. Closes #877 2013-05-21 12:05:44 +01:00
Tom Christie
39783a6e3c Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-21 12:02:32 +01:00
Tom Christie
cdc3c37465 Merge and styling fixes 2013-05-21 12:01:56 +01:00
Tom Christie
8bbb94dea9 Added @atarzwell for docs fix #876. Thanks! 2013-05-21 12:18:37 +02:00
Tom Christie
f77ae156f9 Merge pull request #876 from atarzwell/master
Incorrect import in Tutorial - Step 6 - ViewSets
2013-05-21 00:18:34 -07:00
Andrew Tarzwell
62c7326b77 Update Typo 2013-05-20 17:43:37 -03: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
Tom Christie
6fcffcc9c6 Typo 2013-05-20 14:02:19 +01:00
Tom Christie
26e037d415 Fix broken docs links. Closes #873 2013-05-20 13:49:42 +01:00
Tom Christie
3aad12220d Added @commonorgarden, for fix #875. Thank you :) 2013-05-20 13:46:29 +01:00
Tom Christie
656a13616d Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-20 13:43:49 +01:00
Tom Christie
bc8671d7ea More explicit quickstart guide. Closes #867. 2013-05-20 13:43:26 +01:00
Tom Christie
9f455fbc07 Merge pull request #875 from commonorgarden/master
Issue 874 - Update SlugField to raise validation errors for invalid slugs
2013-05-20 05:20:18 -07:00
David Jones
c3fd7c6685 Updated SlugField to raise validation errors for invalid slugs 2013-05-20 13:04:38 +01:00
Tom Christie
ee543e465f Merge pull request #872 from Neamar/master
Removed typo from documentation
2013-05-20 00:53:40 -07:00
Neamar
4c85829cb7 Legacy parameter order 2013-05-20 10:48:07 +03:00
Neamar
42a8fe8995 Corrected docs (authentication instead of filtering) 2013-05-20 10:42:10 +03: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
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
Tom Christie
351814e110 Added @lolek09 for work on #862. Kick ass! 2013-05-18 18:32:02 +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
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
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
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