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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							de301f3b66 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2014-09-11 13:20:44 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							f2852811f9 
							
						 
					 
					
						
						
							
							Getting tests passing  
						
						 
						
						
						
					 
					
						2014-09-02 17:41:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							bf09c32de8 
							
						 
					 
					
						
						
							
							Code linting and added runtests.py  
						
						 
						
						
						
					 
					
						2014-08-19 13:28:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e385a7b8eb 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2014-08-19 10:11:10 +01: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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