Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4e03518438 
							
						 
					 
					
						
						
							
							required=False for nullable relationships  
						
						
						
					 
					
						2014-11-13 23:30:42 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cb672a0ecb 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  
						
						
						
					 
					
						2014-11-13 22:16:53 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							e70b82b6c8 
							
						 
					 
					
						
						
							
							Update html.py  
						
						
						
					 
					
						2014-11-12 15:38:39 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1838e18aee 
							
						 
					 
					
						
						
							
							Update html.py  
						
						
						
					 
					
						2014-11-12 15:38:05 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a16a8a10a9 
							
						 
					 
					
						
						
							
							.copy() for serializer .data and .errors dictionaries  
						
						
						
					 
					
						2014-11-07 11:16:26 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e399140031 
							
						 
					 
					
						
						
							
							Minor tweaks  
						
						
						
					 
					
						2014-11-07 10:51:08 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9b19b5a594 
							
						 
					 
					
						
						
							
							Serializer cleanup  
						
						
						
					 
					
						2014-11-07 10:13:46 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							db1dd8e240 
							
						 
					 
					
						
						
							
							Tests & fixes for list serialization  
						
						
						
					 
					
						2014-11-06 17:32:33 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4e001dbb7a 
							
						 
					 
					
						
						
							
							Drop usage of SortedDict.  Closes   #2027 .  
						
						
						
					 
					
						2014-11-06 12:00:30 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							207208fedf 
							
						 
					 
					
						
						
							
							Lazy loading of fields and validators.  Closes   #1963 .  
						
						
						
					 
					
						2014-10-31 16:38:39 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							87fdc73f64 
							
						 
					 
					
						
						
							
							Merge pull request  #1920  from thedrow/topic/encoder-improvements  
						
						... 
						
						
						
						The JSON encoder now uses tuples instead of lists 
						
					 
					
						2014-10-09 08:31:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							14ae52a24e 
							
						 
					 
					
						
						
							
							More gradual deprecation  
						
						
						
					 
					
						2014-10-08 16:09:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6bfed6f852 
							
						 
					 
					
						
						
							
							Enforce uniqueness validation for relational fields  
						
						
						
					 
					
						2014-10-07 17:04:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							df7b6fcf58 
							
						 
					 
					
						
						
							
							First pass on incorperating the form rendering into the browsable API  
						
						
						
					 
					
						2014-10-02 16:24:24 +01:00 
						 
				 
			
				
					
						
							
							
								Omer Katz 
							
						 
					 
					
						
						
						
						
							
						
						
							79e91dff92 
							
						 
					 
					
						
						
							
							The encoder now returns tuples instead of lists.  
						
						... 
						
						
						
						Tuples take a little less memory which is significant when serializing a lot of objects. 
						
					 
					
						2014-10-02 16:44:20 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c171fa21ac 
							
						 
					 
					
						
						
							
							First pass at HTML form rendering  
						
						
						
					 
					
						2014-10-01 19:44:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c630a12e26 
							
						 
					 
					
						
						
							
							Deal with lazy strings in serializer reprs  
						
						
						
					 
					
						2014-10-01 13:24:47 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							381771731f 
							
						 
					 
					
						
						
							
							Use six.text_type instead of str everywhere  
						
						
						
					 
					
						2014-10-01 13:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							43fd5a8730 
							
						 
					 
					
						
						
							
							Uniqueness validation  
						
						
						
					 
					
						2014-09-29 09:24:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f4b1dcb167 
							
						 
					 
					
						
						
							
							OPTIONS support  
						
						
						
					 
					
						2014-09-24 14:09:49 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							9fdb2280d1 
							
						 
					 
					
						
						
							
							First pass on ManyRelation  
						
						
						
					 
					
						2014-09-18 14:23:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7e4af0d6 
							
						 
					 
					
						
						
							
							get_base_field() refactor  
						
						
						
					 
					
						2014-09-18 11:20:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							40dc588a37 
							
						 
					 
					
						
						
							
							Drop label from serializer fields when not needed  
						
						
						
					 
					
						2014-09-15 09:50:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							22af49bf8f 
							
						 
					 
					
						
						
							
							Tidy up JSONEncoder  
						
						
						
					 
					
						2014-09-12 11:50:20 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							bf52d04f4c 
							
						 
					 
					
						
						
							
							Nice manager representations on serializer classes  
						
						
						
					 
					
						2014-09-11 20:37:27 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3318f75a71 
							
						 
					 
					
						
						
							
							Improve memory address removal for serializer representations  
						
						
						
					 
					
						2014-09-11 13:50:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							54ccf7230d 
							
						 
					 
					
						
						
							
							Improve memory address removal for serializer representations  
						
						
						
					 
					
						2014-09-11 13:43:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							de301f3b66 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-09-11 13:20:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							80ba047347 
							
						 
					 
					
						
						
							
							Compat fixes  
						
						
						
					 
					
						2014-09-10 16:57:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b1c07670ca 
							
						 
					 
					
						
						
							
							Fleshing out serializer fields  
						
						
						
					 
					
						2014-09-09 17:46:28 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							c9d4497d81 
							
						 
					 
					
						
						
							
							Use force_text from compat  
						
						
						
					 
					
						2014-09-05 15:58:53 -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 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ec096a1cac 
							
						 
					 
					
						
						
							
							Add relations and get tests running  
						
						
						
					 
					
						2014-09-02 15:07:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ac4676a40 
							
						 
					 
					
						
						
							
							First pass  
						
						
						
					 
					
						2014-08-29 16:46:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2737f367 
							
						 
					 
					
						
						
							
							Resolve python3 linting issue  
						
						
						
					 
					
						2014-08-19 14:11:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							bf09c32de8 
							
						 
					 
					
						
						
							
							Code linting and added runtests.py  
						
						
						
					 
					
						2014-08-19 13:28:07 +01:00 
						 
				 
			
				
					
						
							
							
								Paul Oswald 
							
						 
					 
					
						
						
						
						
							
						
						
							3e93c96ece 
							
						 
					 
					
						
						
							
							replace unicode call with force_text  
						
						
						
					 
					
						2014-08-19 10:09:48 +09:00 
						 
				 
			
				
					
						
							
							
								Paul Oswald 
							
						 
					 
					
						
						
						
						
							
						
						
							66fa40c300 
							
						 
					 
					
						
						
							
							evaluate content at function start  
						
						
						
					 
					
						2014-07-29 22:13:11 +09:00 
						 
				 
			
				
					
						
							
							
								Paul Oswald 
							
						 
					 
					
						
						
						
						
							
						
						
							921e4ed2ee 
							
						 
					 
					
						
						
							
							Evaluate content before passing to regex.sub  
						
						... 
						
						
						
						Issue #1708  
						
					 
					
						2014-07-28 16:59:55 +09:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							d08536ad9d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini 
						
					 
					
						2014-04-13 00:05:57 +02:00 
						 
				 
			
				
					
						
							
							
								Ian Leith 
							
						 
					 
					
						
						
						
						
							
						
						
							613df5c650 
							
						 
					 
					
						
						
							
							Fix dict_keys equality test for python 3.  
						
						
						
					 
					
						2014-04-11 05:49:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mathieu Pillard 
							
						 
					 
					
						
						
						
						
							
						
						
							f034cb595a 
							
						 
					 
					
						
						
							
							Encode django QuerySets to lists and not dicts in JSONEncoder  
						
						
						
					 
					
						2014-01-17 13:05:10 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9c41c007af 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py 
						
					 
					
						2013-12-13 16:32:34 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ddd17c69e7 
							
						 
					 
					
						
						
							
							Fix compat issues for  #1231  
						
						
						
					 
					
						2013-12-09 09:24:10 +00:00 
						 
				 
			
				
					
						
							
							
								Malcolm Box 
							
						 
					 
					
						
						
						
						
							
						
						
							263281d71d 
							
						 
					 
					
						
						
							
							Fix issue  #1231 : JSONEncoder doesn't handle dict-like objects  
						
						... 
						
						
						
						Check for __getitem__ and then attempt to convert to a dict.
The check for __getitem__ is there as there's no universal way to
check if an object is a mapping type, but this is a likely proxy 
						
					 
					
						2013-11-21 20:09:48 +00:00