Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							5f8338e276 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  into feature/filepathfield  
						
						
						
					 
					
						2015-03-03 14:34:18 +03:00 
						 
				 
			
				
					
						
							
							
								Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							c20a0250df 
							
						 
					 
					
						
						
							
							add FilePathField, update docs  
						
						
						
					 
					
						2015-03-03 14:34:06 +03:00 
						 
				 
			
				
					
						
							
							
								Kevin Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							b582d52afb 
							
						 
					 
					
						
						
							
							Fix docstring formatting  
						
						
						
					 
					
						2015-02-28 13:06:47 -08:00 
						 
				 
			
				
					
						
							
							
								Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							de72022f80 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Ins1ne/django-rest-framework  into feature/ipaddress  
						
						
						
					 
					
						2015-02-28 14:29:27 +03:00 
						 
				 
			
				
					
						
							
							
								Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							4d5eee04a0 
							
						 
					 
					
						
						
							
							add IPAddressField, update docs  
						
						
						
					 
					
						2015-02-28 10:11:38 +03:00 
						 
				 
			
				
					
						
							
							
								Kevin Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							78e8b1b010 
							
						 
					 
					
						
						
							
							Updated CreateOnlyDefault to call set_context on its default (if callable)  
						
						
						
					 
					
						2015-02-27 22:14:15 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Heidtmann 
							
						 
					 
					
						
						
						
						
							
						
						
							16ffe5e31f 
							
						 
					 
					
						
						
							
							Add tests for callable attributes raising exceptions  
						
						
						
					 
					
						2015-02-26 09:05:37 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dec3493d7c 
							
						 
					 
					
						
						
							
							Minor cleanup  
						
						
						
					 
					
						2015-02-06 14:43:43 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7f801b9a01 
							
						 
					 
					
						
						
							
							Add trim_whitespace to CharField  #2517  
						
						... 
						
						
						
						If set to `True` then leading and trailing
whitespace is trimmed. Defaults to `True`. 
						
					 
					
						2015-02-06 01:09:19 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee4b4f2dc 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-01-30 14:00:25 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							35f6a82462 
							
						 
					 
					
						
						
							
							Added DictField and support for HStoreField.  
						
						
						
					 
					
						2015-01-23 16:27:23 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e8db1834d3 
							
						 
					 
					
						
						
							
							Added UUIDField.  
						
						
						
					 
					
						2015-01-23 15:24:06 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							11efde8905 
							
						 
					 
					
						
						
							
							Merge pull request  #2373  from jakul/document-translations-3.1  
						
						... 
						
						
						
						Document how to translate DRF error messages (version 3.1) 
						
					 
					
						2015-01-09 11:57:02 +00:00 
						 
				 
			
				
					
						
							
							
								Craig Blaszczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7f8d314101 
							
						 
					 
					
						
						
							
							update tests to expect new error messages  
						
						
						
					 
					
						2015-01-08 17:16:47 +00:00 
						 
				 
			
				
					
						
							
							
								Craig Blaszczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							91e316f781 
							
						 
					 
					
						
						
							
							prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings  
						
						
						
					 
					
						2015-01-07 12:46:23 +00:00 
						 
				 
			
				
					
						
							
							
								Craig Blaszczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							32506e2075 
							
						 
					 
					
						
						
							
							update expected error messages in tests  
						
						
						
					 
					
						2015-01-02 11:08:39 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							77e3021fea 
							
						 
					 
					
						
						
							
							Better behaviour with null and '' for blank HTML fields.  
						
						
						
					 
					
						2014-12-20 16:26:51 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1087ccbb25 
							
						 
					 
					
						
						
							
							Drop print statements in tests  
						
						
						
					 
					
						2014-12-18 10:39:00 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							87ac64e41b 
							
						 
					 
					
						
						
							
							Fixes for behavior with empty HTML fields.  
						
						
						
					 
					
						2014-12-18 10:36:52 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3fff5cb6e0 
							
						 
					 
					
						
						
							
							Fix empty HTML values when a default is provided.  
						
						
						
					 
					
						2014-12-17 15:13:48 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							72e08a3e8b 
							
						 
					 
					
						
						
							
							Use unicode internally everywhere for 'repr'  
						
						
						
					 
					
						2014-12-15 11:55:17 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							afe7ed9333 
							
						 
					 
					
						
						
							
							Add allow_blank for ChoiceField  #2184  
						
						... 
						
						
						
						This makes a ChoiceField optional in HTML if
model field has `blank=True` set. 
						
					 
					
						2014-12-09 09:25:06 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e49d22dbda 
							
						 
					 
					
						
						
							
							Allow blank choices to render.  Closes   #2071 .  
						
						
						
					 
					
						2014-11-19 09:31:26 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ed541864e6 
							
						 
					 
					
						
						
							
							Support for bulk create.  Closes   #1965 .  
						
						
						
					 
					
						2014-11-06 10:34:59 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							207208fedf 
							
						 
					 
					
						
						
							
							Lazy loading of fields and validators.  Closes   #1963 .  
						
						
						
					 
					
						2014-10-31 16:38:39 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9ebaabd6eb 
							
						 
					 
					
						
						
							
							unique_for_date/unique_for_month/unique_for_year  
						
						
						
					 
					
						2014-10-28 16:21:49 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							05cbec9dd7 
							
						 
					 
					
						
						
							
							Use serializers.ValidationError  
						
						
						
					 
					
						2014-10-17 13:23:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d9a199ca0d 
							
						 
					 
					
						
						
							
							exceptions.ValidationFailed, not Django's ValidationError  
						
						
						
					 
					
						2014-10-10 14:16:09 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5ead8dc89d 
							
						 
					 
					
						
						
							
							Support empty file fields  
						
						
						
					 
					
						2014-10-08 16:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b2c8ac7f 
							
						 
					 
					
						
						
							
							Absolute URLs for file fields  
						
						
						
					 
					
						2014-09-29 14:12:26 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							2859eaf524 
							
						 
					 
					
						
						
							
							request.data attribute  
						
						
						
					 
					
						2014-09-26 10:46:52 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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