| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Oscar Vilaplana | f1f5f92d89 | Added tests, cleaned up imports | 2013-05-19 14:55:46 +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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Pablo Recio | b9b2297612 | Tests proper encoding in JSONRenderer and UnicodeJSONRenderer | 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Tom Christie | ea9a3d88bc | Merge pull request #859 from craigds/master fix for #765 | 2013-05-18 07:06:21 -07: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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Pablo Recio | 392c8556ae | Display an empty label into related fields if it isn't required | 2013-05-18 15:01:58 +02:00 |  | 
			
				
					| 
							
							
								 Ryan Kaskel | 770ed3de2e | ToMany fields default to read-only if targeting ManyToManyField. | 2013-05-18 13:11:40 +01: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 |  | 
			
				
					| 
							
							
								 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_DASHas a choice if the model's field isn't required | 2013-05-18 12:41:52 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9fe6a103ec | Merge pull request #694 from craigds/master fix function names and dotted lookups for use in PrimaryKeyRelatedField | 2013-05-18 03:38:36 -07:00 |  | 
			
				
					| 
							
							
								 Craig de Stigter | c992b600f7 | add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694 | 2013-05-18 12:32:48 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a73c16b85f | serializers.Field respects ordering on dicts if it exists.  Closes #832 | 2013-05-18 11:27:48 +01:00 |  | 
			
				
					| 
							
							
								 Craig de Stigter | 930bd4d0e1 | add tests for related field source for HyperlinkedRelatedField. #694 | 2013-05-18 12:23:12 +02:00 |  | 
			
				
					| 
							
							
								 Craig de Stigter | 0cd7c80e6e | add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694 | 2013-05-18 12:16:30 +02:00 |  |