Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							53e1a2fcb9 
							
						 
					 
					
						
						
							
							Merge pull request  #2637  from mdentremont/topic/allow-serialize-unsaved-with-relations  
						
						... 
						
						
						
						Support serializing unsaved models with related fields. 
						
					 
					
						2015-03-08 20:22:49 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							0e21f1c4f4 
							
						 
					 
					
						
						
							
							Merge pull request  #2640  from Crystalnix/fix-remove-mergedict  
						
						... 
						
						
						
						Remove `MergeDict` 
						
					 
					
						2015-03-06 19:17:58 -04:00 
						 
				 
			
				
					
						
							
							
								Matt d'Entremont 
							
						 
					 
					
						
						
						
						
							
						
						
							fb58ef043c 
							
						 
					 
					
						
						
							
							Add support for serializing models with m2m related fields  
						
						... 
						
						
						
						- In both ManyRelatedField, provide an empty return when trying to
  access a relation field if the instance in question has no PK (so
  likely hasn't been inserted yet)
- Add relevant tests
- Without these changes, exceptions would be raised when trying to
  serialize the uncreated models as it is impossible to query
  relations without a PK
- Add test to ensure RelatedField does not regress as currently 
  supports being serialized with and unsaved model 
						
					 
					
						2015-03-06 12:50:37 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							58dfde7fcd 
							
						 
					 
					
						
						
							
							Tweaks for cursor pagination and docs  
						
						
						
					 
					
						2015-03-06 10:22:32 +00:00 
						 
				 
			
				
					
						
							
							
								Egor Yurtaev 
							
						 
					 
					
						
						
						
						
							
						
						
							ce31e36973 
							
						 
					 
					
						
						
							
							Remove MergeDict  
						
						... 
						
						
						
						The class MergeDict is deprecated and will be removed in Django 1.9 
						
					 
					
						2015-03-05 18:34:42 +06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f7917928c0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  
						
						
						
					 
					
						2015-03-04 16:17:44 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							18cc0230bf 
							
						 
					 
					
						
						
							
							Clean up pagination attributes  
						
						
						
					 
					
						2015-03-04 15:51:00 +00:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							391b0ae21b 
							
						 
					 
					
						
						
							
							Call default.set_context() only on create. Refs  #2619 .  
						
						
						
					 
					
						2015-03-03 17:02:12 +01:00 
						 
				 
			
				
					
						
							
							
								Kevin Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							78e8b1b010 
							
						 
					 
					
						
						
							
							Updated CreateOnlyDefault to call set_context on its default (if callable)  
						
						
						
					 
					
						2015-02-27 22:14:15 -08:00 
						 
				 
			
				
					
						
							
							
								Janusz Harkot 
							
						 
					 
					
						
						
						
						
							
						
						
							9098856d46 
							
						 
					 
					
						
						
							
							fix DictKey initial value  
						
						
						
					 
					
						2015-02-27 19:46:36 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							32c885c2a0 
							
						 
					 
					
						
						
							
							Ensure validators are new-style classes on python2  
						
						
						
					 
					
						2015-02-27 15:22:19 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cda74b5997 
							
						 
					 
					
						
						
							
							Merge pull request  #2608  from ezheidtmann/dont-swallow-errors-in-callable-sources  
						
						... 
						
						
						
						Dont swallow errors in callable sources 
						
					 
					
						2015-02-27 09:13:01 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Heidtmann 
							
						 
					 
					
						
						
						
						
							
						
						
							e6b06c34c1 
							
						 
					 
					
						
						
							
							Add explanation for this exception mutation  
						
						
						
					 
					
						2015-02-26 09:20:17 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Heidtmann 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb73d5588 
							
						 
					 
					
						
						
							
							Avoid swallowing exceptions thrown in callable attributes  
						
						
						
					 
					
						2015-02-26 09:05:46 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c66f23391a 
							
						 
					 
					
						
						
							
							Merge pull request  #2572  from Ins1ne/master  
						
						... 
						
						
						
						Fix UniqueTogetherValidator for NULL values 
						
					 
					
						2015-02-26 15:56:18 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d219fc0d81 
							
						 
					 
					
						
						
							
							Merge pull request  #2602  from dbrgn/fix-1602  
						
						... 
						
						
						
						List resource not updated between requests 
						
					 
					
						2015-02-26 15:52:54 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							88cd86c956 
							
						 
					 
					
						
						
							
							Merge pull request  #2587  from jpadilla/select-multiple-disabled  
						
						... 
						
						
						
						Disable select field if no choices available 
						
					 
					
						2015-02-26 12:54:58 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							03818ed004 
							
						 
					 
					
						
						
							
							Pagination tweaks and docs  
						
						
						
					 
					
						2015-02-26 12:48:34 +00:00 
						 
				 
			
				
					
						
							
							
								Danilo Bargen 
							
						 
					 
					
						
						
						
						
							
						
						
							86c5fa2401 
							
						 
					 
					
						
						
							
							Force-evaluate querysets (see  #2602 )  
						
						
						
					 
					
						2015-02-25 18:54:47 +01:00 
						 
				 
			
				
					
						
							
							
								Yannick PEROUX 
							
						 
					 
					
						
						
						
						
							
						
						
							940cf2e2e0 
							
						 
					 
					
						
						
							
							Remove duplicated code in routers.SimpleRouter  
						
						
						
					 
					
						2015-02-25 13:29:07 +01:00 
						 
				 
			
				
					
						
							
							
								Yannick PEROUX 
							
						 
					 
					
						
						
						
						
							
						
						
							bdc64d4e73 
							
						 
					 
					
						
						
							
							Fix removal of url_path on @detail_route and @list_route. Fix #  #2583  
						
						... 
						
						
						
						SimpleRouter.get_routes was popping out the url_path kwarg from
list_route and detail_route decorators. This was causing troubles
when the route was re-used, for example if the viewset was
inherited. 
						
					 
					
						2015-02-25 11:54:11 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b69032f3a7 
							
						 
					 
					
						
						
							
							Merge pull request  #2586  from rense/master  
						
						... 
						
						
						
						Set field max_length/max_value as actual attribute. 
						
					 
					
						2015-02-21 15:31:02 +00:00 
						 
				 
			
				
					
						
							
							
								Rense VanderHoek 
							
						 
					 
					
						
						
						
						
							
						
						
							91416632a8 
							
						 
					 
					
						
						
							
							DecimalField fix  
						
						... 
						
						
						
						max_value and min_value are not in kwargs 
						
					 
					
						2015-02-21 12:31:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							7345830c88 
							
						 
					 
					
						
						
							
							Check if sessions are enabled before calling logout.  Closes   #2545 .  
						
						
						
					 
					
						2015-02-20 20:12:39 +01:00 
						 
				 
			
				
					
						
							
							
								Rense VanderHoek 
							
						 
					 
					
						
						
						
						
							
						
						
							9cb547b85f 
							
						 
					 
					
						
						
							
							Validator-fix, added min/max fields to test_metadata  
						
						
						
					 
					
						2015-02-20 17:34:49 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							bb8690cfb3 
							
						 
					 
					
						
						
							
							Disable select field if no choices available  
						
						
						
					 
					
						2015-02-20 11:43:12 -04:00 
						 
				 
			
				
					
						
							
							
								Rense VanderHoek 
							
						 
					 
					
						
						
						
						
							
						
						
							c8609ba652 
							
						 
					 
					
						
						
							
							Set field length/values as actual attributes.  
						
						... 
						
						
						
						The SimpleMetadata class in metadata.py tries to getattr() attributes
on a field. For this to work, max_length and min_length have to be
actually set as an attribute.
Did the same for min_value and max_value and added those two to
SimpleMetadata.get_field_info 
						
					 
					
						2015-02-20 16:31:12 +01:00 
						 
				 
			
				
					
						
							
							
								Rubén Durá Tarí 
							
						 
					 
					
						
						
						
						
							
						
						
							60617f876a 
							
						 
					 
					
						
						
							
							Fixes HiddenField being rendered in HTMLFormRenderer  
						
						
						
					 
					
						2015-02-20 07:50:15 -04:00 
						 
				 
			
				
					
						
							
							
								Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8d95f93e 
							
						 
					 
					
						
						
							
							Skip validation of NULL field only if it part of unique_together  
						
						
						
					 
					
						2015-02-19 18:03:44 +03:00 
						 
				 
			
				
					
						
							
							
								Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							3d85473edf 
							
						 
					 
					
						
						
							
							Fix UniqueTogetherValidator for NULL values  
						
						
						
					 
					
						2015-02-18 21:00:12 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e45e0f0567 
							
						 
					 
					
						
						
							
							Update version  
						
						
						
					 
					
						2015-02-17 13:44:42 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							85bf127943 
							
						 
					 
					
						
						
							
							Merge pull request  #2567  from carltongibson/18-warning  
						
						... 
						
						
						
						Move `importlib` fallback into compat. 
						
					 
					
						2015-02-17 08:39:06 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd2352165 
							
						 
					 
					
						
						
							
							Fixes for latest pep8 updates. Refs  #2563 .  
						
						
						
					 
					
						2015-02-17 10:58:00 +00:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							c5eb5b2201 
							
						 
					 
					
						
						
							
							Move importlib fallback into compat.  
						
						
						
					 
					
						2015-02-17 11:55:15 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							daf1d59d0f 
							
						 
					 
					
						
						
							
							Adjust importlib import  
						
						
						
					 
					
						2015-02-17 11:22:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4248a8d3fc 
							
						 
					 
					
						
						
							
							Merge pull request  #2198  from tomchristie/version-3.1  
						
						... 
						
						
						
						Version 3.1 
						
					 
					
						2015-02-13 13:38:44 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c3425accde 
							
						 
					 
					
						
						
							
							Fix incorrect HTML parsing for DictField  
						
						
						
					 
					
						2015-02-11 14:19:07 +00:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							637af1fc14 
							
						 
					 
					
						
						
							
							Merge pull request  #2540  from linovia/release/3.0.5  
						
						... 
						
						
						
						Release/3.0.5 
						
					 
					
						2015-02-10 23:48:38 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							59b3fe8f39 
							
						 
					 
					
						
						
							
							Bumped the version to 3.0.5  
						
						
						
					 
					
						2015-02-10 22:48:04 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							3522b69394 
							
						 
					 
					
						
						
							
							Add distinct call in filter_queryset  
						
						
						
					 
					
						2015-02-10 10:51:38 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fbb21caaaa 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-02-09 20:43:50 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b2939c157d 
							
						 
					 
					
						
						
							
							Fixes for latest version of pep8  
						
						
						
					 
					
						2015-02-09 17:43:20 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							54d82f59ed 
							
						 
					 
					
						
						
							
							Py3 compat fix  
						
						
						
					 
					
						2015-02-09 17:19:22 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d13c807616 
							
						 
					 
					
						
						
							
							Fix misleading AttributeErrors  
						
						
						
					 
					
						2015-02-09 17:02:54 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0240df1a38 
							
						 
					 
					
						
						
							
							Minor internal API cleanpu  
						
						
						
					 
					
						2015-02-06 16:15:10 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							670723f021 
							
						 
					 
					
						
						
							
							Minor cleanups/improvements to ModelSerializer API  
						
						
						
					 
					
						2015-02-06 15:45:02 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dec3493d7c 
							
						 
					 
					
						
						
							
							Minor cleanup  
						
						
						
					 
					
						2015-02-06 14:43:43 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a435b1b355 
							
						 
					 
					
						
						
							
							Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1  
						
						
						
					 
					
						2015-02-06 14:39:31 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1f99612845 
							
						 
					 
					
						
						
							
							Upgrade pending deprecations to deprecations  
						
						
						
					 
					
						2015-02-06 13:21:35 +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