Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a3067bea55 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.3  
						
						
						
					 
					
						2015-09-17 16:24:46 +01:00 
						 
				 
			
				
					
						
							
							
								Steven Loria 
							
						 
					 
					
						
						
						
						
							
						
						
							284f9faa07 
							
						 
					 
					
						
						
							
							Correctly handle [] and {} as invalid inputs to BooleanField  
						
						
						
					 
					
						2015-09-11 23:12:18 -04:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							4404d40f60 
							
						 
					 
					
						
						
							
							Only pass allow_empty to the ListSerializer if it was in the arguments.  
						
						... 
						
						
						
						Helps with backward compatibility. 
						
					 
					
						2015-09-06 23:02:44 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							dcdd765647 
							
						 
					 
					
						
						
							
							Avoid passing allow_empty to the ListSerializer children.  
						
						
						
					 
					
						2015-09-03 17:27:33 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							39ec564ae9 
							
						 
					 
					
						
						
							
							Do not access settings on compat import  
						
						
						
					 
					
						2015-09-03 14:22:13 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e9e88cbc60 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:tomchristie/django-rest-framework  
						
						
						
					 
					
						2015-09-03 11:24:07 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f9d1a34fdd 
							
						 
					 
					
						
						
							
							Fix nested HTML dictionaries.  Closes   #3314 .  
						
						
						
					 
					
						2015-09-03 11:23:58 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							afd2a8f8f0 
							
						 
					 
					
						
						
							
							Adjust ModelField.null mappings now that Django-25320 is resolved  
						
						
						
					 
					
						2015-09-03 10:12:52 +01:00 
						 
				 
			
				
					
						
							
							
								raphaelmerx 
							
						 
					 
					
						
						
						
						
							
						
						
							b9782b6850 
							
						 
					 
					
						
						
							
							DurationField accepts integers  
						
						
						
					 
					
						2015-09-02 16:47:50 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f87573ffa3 
							
						 
					 
					
						
						
							
							Merge pull request  #3345  from jpadilla/fields  
						
						... 
						
						
						
						Update ModelSerializer 'fields'/'exclude'/'__all__' behavior 
						
					 
					
						2015-08-28 14:57:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							78632849cf 
							
						 
					 
					
						
						
							
							Comment against model_field.null 1.98 behavior  
						
						
						
					 
					
						2015-08-28 13:29:57 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8db6367188 
							
						 
					 
					
						
						
							
							Deal with 1.9's differing null behavior on reverse relationships and m2m  
						
						
						
					 
					
						2015-08-28 12:08:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b51c1ff0b0 
							
						 
					 
					
						
						
							
							Django 1.9's test case HttpResponse.json() is not cachable.  
						
						
						
					 
					
						2015-08-28 11:55:23 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a5ddd90df0 
							
						 
					 
					
						
						
							
							Log in and log out require escape and mark_safe  
						
						
						
					 
					
						2015-08-28 10:27:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							24a2c3f5c3 
							
						 
					 
					
						
						
							
							Resolve unittest compat  
						
						
						
					 
					
						2015-08-28 10:19:18 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e70da5ac6b 
							
						 
					 
					
						
						
							
							Compat for GenericForeignKey, GenericRelation  
						
						
						
					 
					
						2015-08-28 10:03:08 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							654e0e4527 
							
						 
					 
					
						
						
							
							Update ModelSerializer fields behavior  
						
						
						
					 
					
						2015-08-27 13:09:08 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4f27697467 
							
						 
					 
					
						
						
							
							Fix get_model import  
						
						
						
					 
					
						2015-08-27 17:28:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							48540f180a 
							
						 
					 
					
						
						
							
							unittest compat fallback  
						
						
						
					 
					
						2015-08-27 17:11:53 +01:00 
						 
				 
			
				
					
						
							
							
								Rikuoja 
							
						 
					 
					
						
						
						
						
							
						
						
							65df9fd5c6 
							
						 
					 
					
						
						
							
							Fix   #3323  
						
						
						
					 
					
						2015-08-24 17:02:49 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0198bce34f 
							
						 
					 
					
						
						
							
							Release 3.2.3  
						
						
						
					 
					
						2015-08-24 10:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b271946b31 
							
						 
					 
					
						
						
							
							Merge pull request  #3321  from tomchristie/empty-charfield-html  
						
						... 
						
						
						
						Resolve empty HTML charfield behavior. 
						
					 
					
						2015-08-24 10:41:36 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9ac646385f 
							
						 
					 
					
						
						
							
							Resolve empty HTML charfield behavior.  Closes   #3318 .  
						
						
						
					 
					
						2015-08-24 10:13:16 +01:00 
						 
				 
			
				
					
						
							
							
								borzdyko 
							
						 
					 
					
						
						
						
						
							
						
						
							314daaedfa 
							
						 
					 
					
						
						
							
							Using  https://docs.djangoproject.com/en/1.8/ref/models/querysets/#regex  for search filter by starting field with '$'  
						
						
						
					 
					
						2015-08-21 18:13:13 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c271568bf5 
							
						 
					 
					
						
						
							
							Remove erronous checkin  
						
						
						
					 
					
						2015-08-21 10:57:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							314c0095aa 
							
						 
					 
					
						
						
							
							iter_options function should have no cutoff by deault  
						
						
						
					 
					
						2015-08-21 10:56:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							99beeb80e1 
							
						 
					 
					
						
						
							
							No cutoff for default ChoiceField, only for relationships  
						
						
						
					 
					
						2015-08-21 10:53:10 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f4412d0827 
							
						 
					 
					
						
						
							
							Docs for select cutoffs  
						
						
						
					 
					
						2015-08-21 10:52:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c4d8c25a 
							
						 
					 
					
						
						
							
							Resolve duplicate error for IPAddressField.  Closes   #3250 .  
						
						
						
					 
					
						2015-08-20 12:38:48 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							75be91912c 
							
						 
					 
					
						
						
							
							Allow AdminRenderer to function when pagination is disabled.  Closes   #3275 .  
						
						
						
					 
					
						2015-08-20 12:28:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d86fd67895 
							
						 
					 
					
						
						
							
							Fix display of select multiple HTML fields.  Closes   #3290 .  
						
						
						
					 
					
						2015-08-20 12:11:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b4b2dc18fa 
							
						 
					 
					
						
						
							
							Clean-up refactoring of SearchFilter implementation  
						
						
						
					 
					
						2015-08-20 11:35:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							aa4cd7e9d7 
							
						 
					 
					
						
						
							
							Guard against LimitOffsetPagination edge case.  Closes   #3303 .  
						
						
						
					 
					
						2015-08-20 10:12:52 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							8af366a732 
							
						 
					 
					
						
						
							
							Raise error when source= use on a child.  
						
						... 
						
						
						
						Closes  #3292  
					
						2015-08-19 12:32:16 -04:00 
						 
				 
			
				
					
						
							
							
								Omer Katz 
							
						 
					 
					
						
						
						
						
							
						
						
							792005806b 
							
						 
					 
					
						
						
							
							Cached the field's root and context property.  
						
						
						
					 
					
						2015-08-18 12:38:13 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1b53e804ee 
							
						 
					 
					
						
						
							
							3.2.2 Release  
						
						
						
					 
					
						2015-08-13 10:23:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0e6c467851 
							
						 
					 
					
						
						
							
							Merge pull request  #3263  from jgadelange/master  
						
						... 
						
						
						
						Resolved issue with rendering of nested serializers form when value is None 
						
					 
					
						2015-08-13 10:16:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							18af181191 
							
						 
					 
					
						
						
							
							Fix boolean checkboxes setting to False.  Closes   #3258 .  Closes   #2776 .  
						
						
						
					 
					
						2015-08-13 09:56:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jeffrey de Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							f5a9904cc8 
							
						 
					 
					
						
						
							
							Resolved issue with rendering of nested serializers form when value is None  
						
						
						
					 
					
						2015-08-11 20:27:41 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a3e64fbe0d 
							
						 
					 
					
						
						
							
							Resolve issue with rendering nested serializer forms with empty values.  Closes   #3260 .  
						
						
						
					 
					
						2015-08-11 16:25:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0df99a6c95 
							
						 
					 
					
						
						
							
							Fix erronous request.files docs, and incorrect request.FILES behavior.  Closes   #3261 .  
						
						
						
					 
					
						2015-08-11 16:21:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b7e47e3d67 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:tomchristie/django-rest-framework  
						
						
						
					 
					
						2015-08-11 09:24:16 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							83e49dbe63 
							
						 
					 
					
						
						
							
							Fix checkbox input display. Refs  #3258 .  
						
						
						
					 
					
						2015-08-11 09:23:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4509dbc24e 
							
						 
					 
					
						
						
							
							Merge pull request  #3241  from jpadilla/master  
						
						... 
						
						
						
						Raise error if passed a serializer instance 
						
					 
					
						2015-08-10 17:41:01 +01:00 
						 
				 
			
				
					
						
							
							
								James Beith 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0a2b79b3 
							
						 
					 
					
						
						
							
							Remove converting a string in to a string  
						
						... 
						
						
						
						The `display_value` method returns a text type. 
						
					 
					
						2015-08-10 15:33:04 +01:00 
						 
				 
			
				
					
						
							
							
								James Beith 
							
						 
					 
					
						
						
						
						
							
						
						
							2f6e5d0509 
							
						 
					 
					
						
						
							
							Add display value method  
						
						... 
						
						
						
						Returns the text representation of the instance. Subclasses can override this method to provide a different display value used for populating the `choices` property. 
						
					 
					
						2015-08-10 11:03:57 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7a0416c50b 
							
						 
					 
					
						
						
							
							Raise error if passed a serializer instance  
						
						
						
					 
					
						2015-08-07 13:12:37 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0cbfbc27d8 
							
						 
					 
					
						
						
							
							Tweak erronous assignment  
						
						
						
					 
					
						2015-08-07 15:41:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3ea394dbff 
							
						 
					 
					
						
						
							
							Version 3.2.1  
						
						
						
					 
					
						2015-08-07 14:55:18 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							368fb9fb2a 
							
						 
					 
					
						
						
							
							Merge pull request  #3238  from kezabelle/bugfix/3235  
						
						... 
						
						
						
						Fixed  #3235  - ListField now returns the QueryDict value even if it's a list of only one item. 
					
						2015-08-07 14:44:32 +01:00