1032 Commits

Author	SHA1	Message	Date
Oscar Vilaplana	7a5cd090aa	fixed tests, added docs, renamed helper method	2013-05-19 15:45:33 +02:00
Oscar Vilaplana	6bbedfd7ae	fixed merge conflict	2013-05-19 15:18:40 +02:00
Nikolaus Schlemm	31893cff74	* make test assertion more explicit ... * cleanup	2013-05-19 15:12:01 +02:00
Oscar Vilaplana	e80488b619	Added min_length and max_length	2013-05-19 15:08:41 +02:00
Oscar Vilaplana	edbf65c06e	Removed unused imports	2013-05-19 15:06:24 +02:00
Oscar Vilaplana	696c053f4f	s/Single Character/String/	2013-05-19 15:04:43 +02:00
Nikolaus Schlemm	88c94f3720	Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options	2013-05-19 14:58:11 +02:00
Oscar Vilaplana	f1f5f92d89	Added tests, cleaned up imports	2013-05-19 14:55:46 +02:00
Nikolaus Schlemm	efca5f6fec	use double quotes for docstring instead of single quotes	2013-05-19 14:54:16 +02:00
Nikolaus Schlemm	b07cfdcf54	FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate	2013-05-19 13:54:13 +02:00
Nikolaus Schlemm	5473f60192	Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options	2013-05-19 13:46:17 +02:00
Nikolaus Schlemm	1154c12b33	don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate	2013-05-19 11:37:12 +02:00
Nikolaus Schlemm	a91841f7fe	WORKAROUND: avoid errors like "AttributeError: 'APIRoot' object has no attribute 'get_serializer'"	2013-05-19 11:29:41 +02:00
Oscar Vilaplana	08e9e2042c	Disabled label and help_text in unit test. We should change the test so ... that it sets them up.	2013-05-19 11:26:56 +02:00
Oscar Vilaplana	b915c1d4d8	Made field label optional in OPTIONS	2013-05-19 11:15:38 +02:00
Nikolaus Schlemm	c0f3a1c397	Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :)	2013-05-19 09:25:02 +02:00
Nikolaus Schlemm	9454e23aa9	Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options	2013-05-19 09:02:07 +02: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
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
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	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
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
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
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	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
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