BrickXu 
							
						 
					 
					
						
						
						
						
							
						
						
							53f52765fc 
							
						 
					 
					
						
						
							
							Not allow to pass an empty actions to viewset.as_view(). Refs issue  #2171  
						
						
						
					 
					
						2014-12-02 17:07:55 +08:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							e2ea98e8ab 
							
						 
					 
					
						
						
							
							Fixed typos  
						
						
						
					 
					
						2014-11-29 20:23:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							dd9d40d8c0 
							
						 
					 
					
						
						
							
							Moved non-conflicting models  
						
						
						
					 
					
						2014-11-29 20:04:50 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7f9dc73672 
							
						 
					 
					
						
						
							
							Remove XML support from core  
						
						
						
					 
					
						2014-11-29 14:57:51 -04:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							fe745b9616 
							
						 
					 
					
						
						
							
							Remove JSONP support from core  
						
						
						
					 
					
						2014-11-29 14:55:33 -04:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							2f03483f96 
							
						 
					 
					
						
						
							
							Removed unused models  
						
						
						
					 
					
						2014-11-29 19:45:26 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							731c8421af 
							
						 
					 
					
						
						
							
							Remove YAML support from core  
						
						
						
					 
					
						2014-11-29 14:43:05 -04:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc990792c 
							
						 
					 
					
						
						
							
							Merge branch 'version-3.1' into oauth_as_package  
						
						... 
						
						
						
						Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini 
						
					 
					
						2014-11-28 12:14:40 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3a5b3772fe 
							
						 
					 
					
						
						
							
							Use ImproperlyConfigured when model meta lookup fails  
						
						
						
					 
					
						2014-11-28 15:36:04 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6fbd23ab34 
							
						 
					 
					
						
						
							
							Merge pull request  #2086  from beck/doug/blow-up-with-bad-models  
						
						... 
						
						
						
						Ensure _resolve_model does not return None 
						
					 
					
						2014-11-28 15:31:51 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8d989bb16d 
							
						 
					 
					
						
						
							
							Merge pull request  #2143  from linovia/bugfix/1850  
						
						... 
						
						
						
						Bugfix for #1850  
						
					 
					
						2014-11-28 15:01:56 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c8764de788 
							
						 
					 
					
						
						
							
							Drop defunct tests  
						
						
						
					 
					
						2014-11-28 13:04:42 +00:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							767414439b 
							
						 
					 
					
						
						
							
							Be nicer with __closable_objects.  
						
						
						
					 
					
						2014-11-26 22:20:14 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e5ed0077 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'reference/master' into bugfix/1850  
						
						
						
					 
					
						2014-11-26 16:36:56 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							653d626b3c 
							
						 
					 
					
						
						
							
							Fix failing YAML tests  
						
						
						
					 
					
						2014-11-25 11:33:18 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9c58dfec4e 
							
						 
					 
					
						
						
							
							Fix shoddy test case  
						
						
						
					 
					
						2014-11-25 10:34:21 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8586290df8 
							
						 
					 
					
						
						
							
							Apply defaults and requiredness to unique_together fields.  Closes   #2092 .  
						
						
						
					 
					
						2014-11-19 13:55:10 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e49d22dbda 
							
						 
					 
					
						
						
							
							Allow blank choices to render.  Closes   #2071 .  
						
						
						
					 
					
						2014-11-19 09:31:26 +00:00 
						 
				 
			
				
					
						
							
							
								Doug Beck 
							
						 
					 
					
						
						
						
						
							
						
						
							67735687b2 
							
						 
					 
					
						
						
							
							Ensure _resolve_model does not return None  
						
						
						
					 
					
						2014-11-18 01:26:23 -05:00 
						 
				 
			
				
					
						
							
							
								Gregor Müllegger 
							
						 
					 
					
						
						
						
						
							
						
						
							ad060aa360 
							
						 
					 
					
						
						
							
							More helpful error message when default .create fails.  Closes   #2013 .  
						
						
						
					 
					
						2014-11-15 15:29:52 +01:00 
						 
				 
			
				
					
						
							
							
								Eleni Lixourioti 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa7783095 
							
						 
					 
					
						
						
							
							Merge branch 'version-3.1' of github.com:tomchristie/django-rest-framework into oauth_as_package  
						
						... 
						
						
						
						Conflicts:
	.travis.yml 
						
					 
					
						2014-11-15 14:27:41 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ea98de9b88 
							
						 
					 
					
						
						
							
							Model fields with .blank or .null now map to required=False.  Closes   #2017 .  Closes   #2021 .  
						
						
						
					 
					
						2014-11-13 19:28:57 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9e75c4d8ea 
							
						 
					 
					
						
						
							
							Reinstate OPTIONS tests  
						
						
						
					 
					
						2014-11-13 16:24:03 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							502a86cedb 
							
						 
					 
					
						
						
							
							Remove tests/settings. Using conftest instead.  
						
						
						
					 
					
						2014-11-13 16:10:48 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e5cd693e7b 
							
						 
					 
					
						
						
							
							Remove test cruft  
						
						
						
					 
					
						2014-11-13 16:07:25 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f387cd89da 
							
						 
					 
					
						
						
							
							Uniqueness constraints imply a forced 'required=True'. Refs  #1945  
						
						
						
					 
					
						2014-11-10 12:21:27 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							db1dd8e240 
							
						 
					 
					
						
						
							
							Tests & fixes for list serialization  
						
						
						
					 
					
						2014-11-06 17:32:33 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9923a6ce90 
							
						 
					 
					
						
						
							
							Fix tests for py2/3 compat  
						
						
						
					 
					
						2014-11-06 11:51:10 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ed541864e6 
							
						 
					 
					
						
						
							
							Support for bulk create.  Closes   #1965 .  
						
						
						
					 
					
						2014-11-06 10:34:59 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0a5d088287 
							
						 
					 
					
						
						
							
							Fix failing copy of fields when RegexValidator is used.  Closes   #1954 .  
						
						
						
					 
					
						2014-11-05 10:48:30 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2b535954cd 
							
						 
					 
					
						
						
							
							Py2/3 compat for validation test  
						
						
						
					 
					
						2014-11-03 14:14:12 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							003c42b0f5 
							
						 
					 
					
						
						
							
							Use invalid_data key for error message.  Closes   #2002 .  
						
						
						
					 
					
						2014-11-03 14:01:02 +00:00 
						 
				 
			
				
					
						
							
							
								tanwanirahul 
							
						 
					 
					
						
						
						
						
							
						
						
							ea8c405201 
							
						 
					 
					
						
						
							
							Tests for validating custom_method_name router attribute  
						
						
						
					 
					
						2014-11-03 14:44:47 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							65a0d083d6 
							
						 
					 
					
						
						
							
							Merge pull request  #1963  from carljm/lazy-fields  
						
						... 
						
						
						
						Set up serializer fields lazily on-demand. 
						
					 
					
						2014-10-31 16:40:06 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							207208fedf 
							
						 
					 
					
						
						
							
							Lazy loading of fields and validators.  Closes   #1963 .  
						
						
						
					 
					
						2014-10-31 16:38:39 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							11075d3770 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.0  
						
						
						
					 
					
						2014-10-31 16:05:45 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0dea509dc9 
							
						 
					 
					
						
						
							
							Nested serializer tests  
						
						
						
					 
					
						2014-10-30 15:59:16 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9ebaabd6eb 
							
						 
					 
					
						
						
							
							unique_for_date/unique_for_month/unique_for_year  
						
						
						
					 
					
						2014-10-28 16:21:49 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ae53fdff9c 
							
						 
					 
					
						
						
							
							First pass at unique_for_date, unique_for_month, unique_for_year  
						
						
						
					 
					
						2014-10-22 13:30:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c5d1be8eac 
							
						 
					 
					
						
						
							
							.validate() can raise field errors or non-field errors  
						
						
						
					 
					
						2014-10-22 10:32:32 +01:00 
						 
				 
			
				
					
						
							
							
								Carl Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							140f8620ae 
							
						 
					 
					
						
						
							
							Set up serializer fields lazily on-demand.  
						
						... 
						
						
						
						This avoids AppRegistryNotReady problems in Django 1.7 with nested serializers,
which are instantiated at import time, possibly before Django's app registry is
fully populated. 
						
					 
					
						2014-10-17 09:50:57 -06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							05cbec9dd7 
							
						 
					 
					
						
						
							
							Use serializers.ValidationError  
						
						
						
					 
					
						2014-10-17 13:23:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3af5df1955 
							
						 
					 
					
						
						
							
							Performance for PK fields  
						
						
						
					 
					
						2014-10-16 20:47:57 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d9a199ca0d 
							
						 
					 
					
						
						
							
							exceptions.ValidationFailed, not Django's ValidationError  
						
						
						
					 
					
						2014-10-10 14:16:09 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5d247a65c8 
							
						 
					 
					
						
						
							
							First pass on nested serializers in HTML  
						
						
						
					 
					
						2014-10-09 15:11:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5f4cc52ef5 
							
						 
					 
					
						
						
							
							Tweaking  
						
						
						
					 
					
						2014-10-09 10:11:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5ead8dc89d 
							
						 
					 
					
						
						
							
							Support empty file fields  
						
						
						
					 
					
						2014-10-08 16:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							af0f01c5b6 
							
						 
					 
					
						
						
							
							Move generic relation tests  
						
						
						
					 
					
						2014-10-08 11:23:40 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6b09e5f2bb 
							
						 
					 
					
						
						
							
							Tests for generic relationships  
						
						
						
					 
					
						2014-10-08 11:22:10 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							093febb912 
							
						 
					 
					
						
						
							
							Tests for relational fields  
						
						
						
					 
					
						2014-10-08 11:04:08 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							311d315a73 
							
						 
					 
					
						
						
							
							Reverted  59d0a0387d and fixed the tests  
						
						
						
					 
					
						2014-10-08 08:33:28 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6bfed6f852 
							
						 
					 
					
						
						
							
							Enforce uniqueness validation for relational fields  
						
						
						
					 
					
						2014-10-07 17:04:53 +01:00 
						 
				 
			
				
					
						
							
							
								Jones Chi 
							
						 
					 
					
						
						
						
						
							
						
						
							2dfe75c23a 
							
						 
					 
					
						
						
							
							Fix follow does not work on APIClient  
						
						... 
						
						
						
						Handle follow just like Django's Client. 
						
					 
					
						2014-10-06 15:10:35 +08:00 
						 
				 
			
				
					
						
							
							
								Craig de Stigter 
							
						 
					 
					
						
						
						
						
							
						
						
							857a8486b1 
							
						 
					 
					
						
						
							
							More spelling tweaks  
						
						
						
					 
					
						2014-10-03 09:00:33 +13:00 
						 
				 
			
				
					
						
							
							
								Craig de Stigter 
							
						 
					 
					
						
						
						
						
							
						
						
							dfab9af294 
							
						 
					 
					
						
						
							
							Minor: fix spelling and grammar, mostly in 3.0 announcement  
						
						
						
					 
					
						2014-10-03 08:41:18 +13:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c171fa21ac 
							
						 
					 
					
						
						
							
							First pass at HTML form rendering  
						
						
						
					 
					
						2014-10-01 19:44:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b2c8ac7f 
							
						 
					 
					
						
						
							
							Absolute URLs for file fields  
						
						
						
					 
					
						2014-09-29 14:12:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4798df52df 
							
						 
					 
					
						
						
							
							Update release notes  
						
						
						
					 
					
						2014-09-29 12:57:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9805a085fb 
							
						 
					 
					
						
						
							
							UniqueTogetherValidator  
						
						
						
					 
					
						2014-09-29 11:23:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							43fd5a8730 
							
						 
					 
					
						
						
							
							Uniqueness validation  
						
						
						
					 
					
						2014-09-29 09:24:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dee3f78cb6 
							
						 
					 
					
						
						
							
							FileField and ImageField  
						
						
						
					 
					
						2014-09-26 17:06:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8be4496586 
							
						 
					 
					
						
						
							
							Drop erronous print statements  
						
						
						
					 
					
						2014-09-26 13:59:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2e87de0143 
							
						 
					 
					
						
						
							
							Added ListField  
						
						
						
					 
					
						2014-09-26 13:08:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8b8623c5f8 
							
						 
					 
					
						
						
							
							Allow many, partial and context in BaseSerializer  
						
						
						
					 
					
						2014-09-26 12:48:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2859eaf524 
							
						 
					 
					
						
						
							
							request.data attribute  
						
						
						
					 
					
						2014-09-26 10:46:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							417fe1b675 
							
						 
					 
					
						
						
							
							Partial support  
						
						
						
					 
					
						2014-09-25 13:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8ee92f8a18 
							
						 
					 
					
						
						
							
							Refuse to downcast from datetime to date or time  
						
						
						
					 
					
						2014-09-25 13:10:33 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b47ca158b9 
							
						 
					 
					
						
						
							
							Check for redundant  on SerializerMethodField  
						
						
						
					 
					
						2014-09-25 12:09:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							64632da371 
							
						 
					 
					
						
						
							
							Clean up bind - no longer needs to be called multiple times in nested fields  
						
						
						
					 
					
						2014-09-25 11:40:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1420c76453 
							
						 
					 
					
						
						
							
							Ensure proper sorting of 'choices' attribute on ChoiceField  
						
						
						
					 
					
						2014-09-25 10:49:25 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fb1546ee50 
							
						 
					 
					
						
						
							
							Enforce field_name != source  
						
						
						
					 
					
						2014-09-24 20:53:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							358445c174 
							
						 
					 
					
						
						
							
							Drop redundant OPTIONS tests  
						
						
						
					 
					
						2014-09-24 14:52:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f4b1dcb167 
							
						 
					 
					
						
						
							
							OPTIONS support  
						
						
						
					 
					
						2014-09-24 14:09:49 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							90139b3efc 
							
						 
					 
					
						
						
							
							Remove left unicode strings  
						
						
						
					 
					
						2014-09-23 21:18:56 -04:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							e8c01ecdab 
							
						 
					 
					
						
						
							
							Correctly propagate cloned_request for OPTIONS  
						
						... 
						
						
						
						Update to fix pending changes in #1507  
						
					 
					
						2014-09-23 21:12:58 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0404f09a7e 
							
						 
					 
					
						
						
							
							NullBooleanField  
						
						
						
					 
					
						2014-09-23 14:30:17 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f22d0afc3d 
							
						 
					 
					
						
						
							
							Tests for field choices  
						
						
						
					 
					
						2014-09-23 14:15:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5d80f7f932 
							
						 
					 
					
						
						
							
							allow_blank, allow_null  
						
						
						
					 
					
						2014-09-22 17:46:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5a95baf2a2 
							
						 
					 
					
						
						
							
							Tests & tweaks for ChoiceField  
						
						
						
					 
					
						2014-09-22 16:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b5454dd022 
							
						 
					 
					
						
						
							
							Tests and tweaks for choice fields  
						
						
						
					 
					
						2014-09-22 16:50:04 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f0a97595 
							
						 
					 
					
						
						
							
							More compat fixes  
						
						
						
					 
					
						2014-09-22 16:45:06 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5586b6581d 
							
						 
					 
					
						
						
							
							Support format=None for date/time fields  
						
						
						
					 
					
						2014-09-22 16:02:59 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4db23cae21 
							
						 
					 
					
						
						
							
							Tweaks to DecimalField  
						
						
						
					 
					
						2014-09-22 15:34:06 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							249253a144 
							
						 
					 
					
						
						
							
							Fix compat issues  
						
						
						
					 
					
						2014-09-22 14:54:33 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							afb3f8ab0a 
							
						 
					 
					
						
						
							
							Tests and tweaks for text fields  
						
						
						
					 
					
						2014-09-22 13:26:47 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							af46fd6b00 
							
						 
					 
					
						
						
							
							Field tests and associated cleanup  
						
						
						
					 
					
						2014-09-22 12:25:57 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cf72b9a8b7 
							
						 
					 
					
						
						
							
							Moar tests  
						
						
						
					 
					
						2014-09-19 16:43:13 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b361c54c5c 
							
						 
					 
					
						
						
							
							Test rejigging  
						
						
						
					 
					
						2014-09-19 15:46:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							88008c0a68 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.0  
						
						
						
					 
					
						2014-09-19 14:05:50 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							12ccb0fe8a 
							
						 
					 
					
						
						
							
							Test tweaking  
						
						
						
					 
					
						2014-09-19 09:09:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f90049316a 
							
						 
					 
					
						
						
							
							Added a model update integration test  
						
						
						
					 
					
						2014-09-18 15:47:27 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							106362b437 
							
						 
					 
					
						
						
							
							ModelSerializer.create() to handle many to many by default  
						
						
						
					 
					
						2014-09-18 14:58:08 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9fdb2280d1 
							
						 
					 
					
						
						
							
							First pass on ManyRelation  
						
						
						
					 
					
						2014-09-18 14:23:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3bc628edc0 
							
						 
					 
					
						
						
							
							Test for custom fields  
						
						
						
					 
					
						2014-09-18 13:07:38 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							87734be5f4 
							
						 
					 
					
						
						
							
							Configuration correctness tests on ModelSerializer  
						
						
						
					 
					
						2014-09-18 12:17:21 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7e4af0d6 
							
						 
					 
					
						
						
							
							get_base_field() refactor  
						
						
						
					 
					
						2014-09-18 11:20:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c0155fd9dc 
							
						 
					 
					
						
						
							
							Update comments  
						
						
						
					 
					
						2014-09-17 14:11:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ddc661b01 
							
						 
					 
					
						
						
							
							Tests for through relationships  
						
						
						
					 
					
						2014-09-15 14:05:58 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d196608d5a 
							
						 
					 
					
						
						
							
							Fix nested model serializer base class  
						
						
						
					 
					
						2014-09-15 13:55:09 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0c15b97b33 
							
						 
					 
					
						
						
							
							Tests for reverse relationships  
						
						
						
					 
					
						2014-09-15 13:48:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c1e2a9cba6 
							
						 
					 
					
						
						
							
							Clean up field mapping tests  
						
						
						
					 
					
						2014-09-15 13:38:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3cf7ed10d2 
							
						 
					 
					
						
						
							
							Fix erronous import  
						
						
						
					 
					
						2014-09-15 13:10:58 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							40dc588a37 
							
						 
					 
					
						
						
							
							Drop label from serializer fields when not needed  
						
						
						
					 
					
						2014-09-15 09:50:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							afb28a44ad 
							
						 
					 
					
						
						
							
							Dealing with reverse relationships  
						
						
						
					 
					
						2014-09-12 21:32:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1f75ffc791 
							
						 
					 
					
						
						
							
							Access validation messages in a way thats compatible with 1.4, 1.5  
						
						
						
					 
					
						2014-09-12 19:50:30 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b73a205cc0 
							
						 
					 
					
						
						
							
							Tests for relational fields (not including many=True)  
						
						
						
					 
					
						2014-09-12 17:03:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							79715f01f8 
							
						 
					 
					
						
						
							
							Coerce dates etc to ISO_8601 in seralizer, by default.  
						
						
						
					 
					
						2014-09-12 12:10:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5e39e159ee 
							
						 
					 
					
						
						
							
							UNICODE_JSON and COMPACT_JSON settings  
						
						
						
					 
					
						2014-09-12 11:38:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							250755def7 
							
						 
					 
					
						
						
							
							Clean up relational fields queryset usage  
						
						
						
					 
					
						2014-09-12 10:59:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0d354e8f92 
							
						 
					 
					
						
						
							
							to_internal_value() and to_representation()  
						
						
						
					 
					
						2014-09-12 09:49:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							adcb64ab41 
							
						 
					 
					
						
						
							
							MethodField -> SerializerMethodField  
						
						
						
					 
					
						2014-09-12 09:12:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							040bfcc09c 
							
						 
					 
					
						
						
							
							NotImplemented stubs for Field, and DecimalField improvements  
						
						
						
					 
					
						2014-09-11 21:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							19b8f779de 
							
						 
					 
					
						
						
							
							Throttles now use Retry-After header and no longer support the custom style  
						
						
						
					 
					
						2014-09-11 20:43:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							bf52d04f4c 
							
						 
					 
					
						
						
							
							Nice manager representations on serializer classes  
						
						
						
					 
					
						2014-09-11 20:37:27 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							de301f3b66 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-09-11 13:20:44 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Skrajnowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ae84438530 
							
						 
					 
					
						
						
							
							Added DefaultRouter support (and test) for viewsets without the default action implemented, which is usually the list action.  
						
						
						
					 
					
						2014-09-11 12:42:36 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b1c07670ca 
							
						 
					 
					
						
						
							
							Fleshing out serializer fields  
						
						
						
					 
					
						2014-09-09 17:46:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							21980b800d 
							
						 
					 
					
						
						
							
							More test sorting  
						
						
						
					 
					
						2014-09-08 14:24:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							168710813c 
							
						 
					 
					
						
						
							
							Merge pull request  #1844  from adamsc64/issue_1533  
						
						... 
						
						
						
						Fixed  #1533  - Resolved issue with integer keys on nested choices never v... 
					
						2014-09-08 10:15:26 +01:00 
						 
				 
			
				
					
						
							
							
								Christopher Adams 
							
						 
					 
					
						
						
						
						
							
						
						
							613a301a36 
							
						 
					 
					
						
						
							
							Fixed   #1533  - Resolved issue with integer keys on nested choices never validating.  
						
						... 
						
						
						
						- Added unit test for nested `choices` argument.
- Added unit test for non-nested `choices` argument. 
						
					 
					
						2014-09-06 17:13:28 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5bbfef36f4 
							
						 
					 
					
						
						
							
							Merge pull request  #1838  from jbittel/fix-encoded-filename-rfc6266  
						
						... 
						
						
						
						Support RFC6266 encoded filenames 
						
					 
					
						2014-09-06 07:13:12 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							97ebd68f68 
							
						 
					 
					
						
						
							
							Remove unicode strings  
						
						
						
					 
					
						2014-09-05 16:01:17 -07:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							3e20b0110c 
							
						 
					 
					
						
						
							
							Fix linting issues  
						
						
						
					 
					
						2014-09-05 15:58:42 -07:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							d44a8f24ff 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'poswald/view-description-as-promise' into view-description-as-promise  
						
						
						
					 
					
						2014-09-05 15:34:16 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							959e234260 
							
						 
					 
					
						
						
							
							Move parser tests to correct directory  
						
						
						
					 
					
						2014-09-05 15:33:47 -07:00 
						 
				 
			
				
					
						
							
							
								Jharrod LaFon 
							
						 
					 
					
						
						
						
						
							
						
						
							baa518cd89 
							
						 
					 
					
						
						
							
							Moved OAuth support out of DRF and into a separate package, per  #1767  
						
						
						
					 
					
						2014-09-05 15:30:01 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							c8e475023c 
							
						 
					 
					
						
						
							
							Fix encoded filename parsing to allow for lang  
						
						
						
					 
					
						2014-09-05 15:22:43 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							644f9b5421 
							
						 
					 
					
						
						
							
							Removed assert for wrong charset  
						
						
						
					 
					
						2014-09-05 14:51:31 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							6e90dad8e3 
							
						 
					 
					
						
						
							
							Added test for encoded filename  
						
						
						
					 
					
						2014-09-05 14:51:07 -07:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							5add55abc8 
							
						 
					 
					
						
						
							
							Failing test case for  #1432  
						
						
						
					 
					
						2014-09-05 11:33:54 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d934824bff 
							
						 
					 
					
						
						
							
							Workin on  
						
						
						
					 
					
						2014-09-05 16:29:46 +01:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3cc00edd 
							
						 
					 
					
						
						
							
							Delete useless assert  
						
						
						
					 
					
						2014-09-05 14:36:35 +02:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b841ae44 
							
						 
					 
					
						
						
							
							Use Serializer instead of ModelSerializer  
						
						
						
					 
					
						2014-09-05 14:08:11 +02:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							e39422e35f 
							
						 
					 
					
						
						
							
							Check object in tests  
						
						
						
					 
					
						2014-09-05 11:27:36 +02:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							d9633c6817 
							
						 
					 
					
						
						
							
							Fix returning None when allow_none is True in CharField  
						
						
						
					 
					
						2014-09-05 11:08:34 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2e632e5af2 
							
						 
					 
					
						
						
							
							Merge pull request  #1820  from carltongibson/login-dropdown  
						
						... 
						
						
						
						Hide login link in browsable API if the login view is not registered. 
						
					 
					
						2014-09-05 09:07:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c1036c1753 
							
						 
					 
					
						
						
							
							More test passing  
						
						
						
					 
					
						2014-09-03 16:34:09 +01:00 
						 
				 
			
				
					
						
							
							
								Michał Jaworski 
							
						 
					 
					
						
						
						
						
							
						
						
							deb19272b7 
							
						 
					 
					
						
						
							
							Add custom pagination test that covers case with custom object serializer class  
						
						
						
					 
					
						2014-09-03 16:49:32 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f2852811f9 
							
						 
					 
					
						
						
							
							Getting tests passing  
						
						
						
					 
					
						2014-09-02 17:41:23 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ec096a1cac 
							
						 
					 
					
						
						
							
							Add relations and get tests running  
						
						
						
					 
					
						2014-09-02 15:07:56 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							1e491c82e6 
							
						 
					 
					
						
						
							
							Fix imports  
						
						
						
					 
					
						2014-09-02 15:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							4836afa89f 
							
						 
					 
					
						
						
							
							Fix docstring  
						
						
						
					 
					
						2014-09-02 15:11:23 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							fa0ef17737 
							
						 
					 
					
						
						
							
							Remove Login Dropdown when Auth Views are not registered.  
						
						... 
						
						
						
						Fixes  #1738  
					
						2014-09-02 14:53:37 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							0e51dab8f4 
							
						 
					 
					
						
						
							
							Comform to flake8  
						
						
						
					 
					
						2014-09-01 10:09:46 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							1c9c5d5c32 
							
						 
					 
					
						
						
							
							Regression for  #1810 : Test login view renders  
						
						
						
					 
					
						2014-09-01 10:07:05 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b3253b4283 
							
						 
					 
					
						
						
							
							Remove .model usage in tests.  
						
						... 
						
						
						
						Remove the shortcut `.model` view attribute usage from test cases. 
						
					 
					
						2014-08-29 12:35:53 +01:00 
						 
				 
			
				
					
						
							
							
								Dmitry Mukhin 
							
						 
					 
					
						
						
						
						
							
						
						
							3b07d0c997 
							
						 
					 
					
						
						
							
							Merge branch 'master' into set-retry-after  
						
						... 
						
						
						
						Conflicts:
	tests/test_throttling.py 
						
					 
					
						2014-08-20 20:04:48 +04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							63d02dbea8 
							
						 
					 
					
						
						
							
							Drop six from compat. 1.4.2 is now the lowest supported version.  
						
						
						
					 
					
						2014-08-19 17:06:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5358243ca5 
							
						 
					 
					
						
						
							
							Merge pull request  #1778  from linovia/bugfix/1398  
						
						... 
						
						
						
						Bugfix/1398 
						
					 
					
						2014-08-19 16:16:02 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							06b6b96f93 
							
						 
					 
					
						
						
							
							Remove duplicated model declaration.  
						
						
						
					 
					
						2014-08-19 16:32:30 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d2795dd26d 
							
						 
					 
					
						
						
							
							Resolve linting issues  
						
						
						
					 
					
						2014-08-19 13:54:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							bf09c32de8 
							
						 
					 
					
						
						
							
							Code linting and added runtests.py  
						
						
						
					 
					
						2014-08-19 13:28:07 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							c9535c036b 
							
						 
					 
					
						
						
							
							Merged  #1398  against 2.4 branch.  
						
						
						
					 
					
						2014-08-19 11:12:36 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e385a7b8eb 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-08-19 10:11:10 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							4876bec9f5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	rest_framework/fields.py 
						
					 
					
						2014-07-26 00:06:56 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							2489e38a06 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	docs/api-guide/viewsets.md
	rest_framework/serializers.py
	rest_framework/throttling.py
	tests/test_generics.py
	tests/test_serializers.py
	tox.ini 
						
					 
					
						2014-06-23 14:02:45 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							e5441d845e 
							
						 
					 
					
						
						
							
							Use urls functions from django instead of compat.  
						
						
						
					 
					
						2014-05-01 08:41:37 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4463f739 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'reference/2.4.0' into feature/pytest  
						
						... 
						
						
						
						Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini 
						
					 
					
						2014-05-01 08:01:38 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							2aca69a946 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'reference/master' into feature/pytest  
						
						... 
						
						
						
						Conflicts:
	tests/test_serializer.py 
						
					 
					
						2014-04-30 22:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							1797a74e82 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'pelme/pytest' into feature/pytest  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	rest_framework/runtests/runtests.py
	tests/test_filters.py
	tests/test_pagination.py
	tox.ini 
						
					 
					
						2014-04-17 09:53:44 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Pelme 
							
						 
					 
					
						
						
						
						
							
						
						
							971578ca34 
							
						 
					 
					
						
						
							
							Support for running the test suite with py.test  
						
						... 
						
						
						
						* Get rid of runtests.py
 * Moved test code  from rest_framework/tests and rest_framework/runtests to tests
 * Invoke py.test from setup.py
 * Invoke py.test from Travis
 * Invoke py.test from tox
 * Changed setUpClass to be just plain setUp in test_permissions.py
 * Updated contribution guideline to show how to invoke py.test 
						
					 
					
						2014-03-02 12:40:30 +01:00