| 
							
							
								 Tom Christie | 937ef00808 | Merge branch 'master' into 2.2 | 2013-02-04 21:19:11 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 221e77d357 | Fix incorrect test name.  Fixes #635 | 2013-02-04 21:18:54 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b052c92ac3 | Cleanup imports Mostly adding `from __future__ import unicode_literals` everywhere. | 2013-02-04 20:55:35 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8e846bdf52 | Merge branch 'py3k' into 2.2 Conflicts:
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_slug.py | 2013-02-04 20:37:09 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2c634c0e5c | Use request.QUERY_PARAMS internally (instead of request.GET) | 2013-02-04 19:51:31 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f4f237e3ee | 3.2, 3.3 compat | 2013-02-01 14:03:28 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d9c7b1c585 | Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working Conflicts:
	rest_framework/authentication.py
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/settings.py
	rest_framework/tests/authentication.py
	rest_framework/tests/genericrelations.py
	rest_framework/tests/generics.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_nested.py
	rest_framework/tests/relations_pk.py
	rest_framework/tests/serializer.py | 2013-02-01 11:58:55 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | be6df3ae3c | Merge branch 'master' into many-fields Conflicts:
	rest_framework/relations.py | 2013-01-30 13:41:56 +00:00 |  | 
			
				
					| 
							
							
								 Fernando Rocha | 41364b3be0 | Added regretion test for issue #632 Signed-off-by: Fernando Rocha <fernandogrd@gmail.com> | 2013-01-30 09:22:36 -03:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a3a06d11cc | Ensure model field validation is performed for ModelSerializers with a custom restore_object method.  Fixes #623. | 2013-01-28 12:56:42 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b5d8f50f9d | Merge branch 'master' into many-fields | 2013-01-26 21:37:43 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4d43e9f7de | Test for custom pagination serializers.  Also refs #604. | 2013-01-26 20:55:09 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b783887c33 | Test for GFK, using RelatedField.  Refs #607. | 2013-01-25 14:36:27 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b73d7e9bb4 | Cleaning up GFK test module.  Refs #607. | 2013-01-25 13:58:19 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d6628d4e78 | Test for #552. | 2013-01-24 08:58:19 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4a4fe60e33 | Merge pull request #603 from minddust/validation_error Add failed testcase for fieldvalidation + fix | 2013-01-23 01:21:26 -08:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | f0071dbccd | Add separate test for failed custom validation | 2013-01-23 07:52:56 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b7ab2aee46 | Merge branch 'master' into unauthenticated_response Conflicts:
	docs/api-guide/authentication.md | 2013-01-22 09:11:38 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 65b62d64ec | WWW-Authenticate responses | 2013-01-21 21:29:49 +00:00 |  | 
			
				
					| 
							
							
								 Kevin Stone | e7916ae0b1 | Tweaked some method names to be more clear and added a docstring to the test case class. Signed-off-by: Kevin Stone <kevinastone@gmail.com> | 2013-01-21 09:37:50 -08:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | dc1c57d595 | Add failed testcase for fieldvalidation | 2013-01-21 12:45:30 +01:00 |  | 
			
				
					| 
							
							
								 Kevin Stone | 71bd2faa79 | Added test case for format_suffix_patterns to validate changes introduced with issue #593. Signed-off-by: Kevin Stone <kevinastone@gmail.com> | 2013-01-20 13:03:38 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 37d49429ca | Raise assertion errors if @api_view decorator is applied incorrectly. Fixes #596. | 2013-01-19 15:51:14 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a98049c5de | Drop unneeded test | 2013-01-19 15:25:32 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4eb5861f36 | Starting migration from ManyField to Field(many=True) | 2013-01-18 23:36:35 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 211bb89eec | Raise Validation Errors when relationships receive incorrect types. Fixes #590. | 2013-01-18 21:29:21 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6385ac519d | Revert accidental merge. | 2013-01-18 19:47:57 +00:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 221f7326c7 | Use None to delete nested object as opposed to _delete flag | 2013-01-16 16:04:20 -08:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 2d62bcd5aa | Add one-to-one nested update and delete functionality | 2013-01-16 16:04:20 -08:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 8e5003a1f6 | Update errant test comment | 2013-01-16 16:04:20 -08:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 46eea97380 | Update one-to-one test names | 2013-01-16 16:04:19 -08:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | e66eeb4af8 | Remove commented out debug code | 2013-01-16 16:04:19 -08:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 72c04d570d | Add nested create for 1to1 reverse relationships | 2013-01-16 16:04:19 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | eb3d4d0e93 | Drop bits of relations_slug tests which don't mirror existing tests. | 2013-01-16 14:32:51 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 875841c76a | Merge branch 'master' of https://github.com/steve-gregory/django-rest-framework into slug-field-fixes | 2013-01-16 13:24:09 +00:00 |  | 
			
				
					| 
							
							
								 Steven Gregory | 87029122c2 | Added a new file 'relations_slug.py' that tests Nullable Foreign Keys and the SlugRelatedField | 2013-01-15 13:49:48 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | da6b9576c5 | Update docstrings | 2013-01-15 10:51:10 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d9acec3e6d | PK fields should only be read-only if they are an AutoField.  Fixes #563 | 2013-01-12 09:43:14 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 73c4e5c460 | auto_now and auto_now_add fields should be read only by default | 2013-01-12 09:43:14 +00:00 |  | 
			
				
					| 
							
							
								 Juan Riaza | 268f60999c | unused imports | 2013-01-10 15:48:22 +01:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 81691ff900 | Merge remote-tracking branch 'upstream/master' into null-one-to-one | 2013-01-08 08:33:01 -08:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | a897eb5480 | Create separate *NullableOneToOneTests TestCase | 2013-01-07 16:27:31 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4e8f55887d | Clean up test slightly.  Refs #552 | 2013-01-07 21:37:44 +00:00 |  | 
			
				
					| 
							
							
								 Marc Tamlyn | c736b80290 | Be more informative when reporting import errors. | 2013-01-07 12:52:20 +00:00 |  | 
			
				
					| 
							
							
								 Juan Riaza | a061e3d9e2 | deprecate simplejson | 2013-01-05 13:40:02 +01:00 |  | 
			
				
					| 
							
							
								 Mark Aaron Shirley | 213981cef3 | Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one | 2013-01-04 21:11:03 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 26f9acb45a | Validation errors instead of exceptions when serializers receive incorrect types.  Fixes #402. | 2013-01-04 14:11:05 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | eb14278a3b | Add proper validation for updating relational fields with incorrect types.  Fixes #446. | 2013-01-04 13:50:40 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4c86fd46d7 | Rename module for basic relational field tests | 2013-01-04 13:05:31 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6e9865cb71 | Fix for #446.  Note: Also needs applying to other relational types. | 2013-01-03 23:17:31 +00:00 |  |