Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							35787fb3ca 
							
						 
					 
					
						
						
							
							Merge pull request  #1460  from inglesp/issue1434  
						
						... 
						
						
						
						Add SEARCH_PARAM and ORDERING_PARAM to settings 
						
					 
					
						2014-03-07 07:36:37 +00:00 
						 
				 
			
				
					
						
							
							
								Peter Inglesby 
							
						 
					 
					
						
						
						
						
							
						
						
							29f5ce7aeb 
							
						 
					 
					
						
						
							
							Use six to reload module  
						
						
						
					 
					
						2014-03-06 23:51:02 +00:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							d48e8ca8d6 
							
						 
					 
					
						
						
							
							Merge pull request  #1459  from linovia/bugfix/optional_unique_validation  
						
						... 
						
						
						
						Unique constraint are validated even if the field is optional. 
						
					 
					
						2014-03-06 22:48:16 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Inglesby 
							
						 
					 
					
						
						
						
						
							
						
						
							2353878951 
							
						 
					 
					
						
						
							
							Add SEARCH_PARAM and ORDERING_PARAM to settings  
						
						... 
						
						
						
						Fixes  #1434  
					
						2014-03-06 21:39:44 +00:00 
						 
				 
			
				
					
						
							
							
								Eric Buehl 
							
						 
					 
					
						
						
						
						
							
						
						
							34887ed756 
							
						 
					 
					
						
						
							
							it's safe to import scope and constants  
						
						
						
					 
					
						2014-03-06 20:21:44 +00:00 
						 
				 
			
				
					
						
							
							
								Eric Buehl 
							
						 
					 
					
						
						
						
						
							
						
						
							86375f2d95 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
					 
					
						2014-03-06 20:21:27 +00:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							51e6982397 
							
						 
					 
					
						
						
							
							Fixed the validation for optional fields that have a value.  
						
						
						
					 
					
						2014-03-06 21:18:37 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							caf4d36cb3 
							
						 
					 
					
						
						
							
							More complex test case.  
						
						
						
					 
					
						2014-03-06 21:17:41 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							de899824b8 
							
						 
					 
					
						
						
							
							Forgot to add the ref field to the field list.  
						
						
						
					 
					
						2014-03-06 16:43:30 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							9e291879d1 
							
						 
					 
					
						
						
							
							Added an optional unique field to Album and checked that duplicates are detected.  
						
						
						
					 
					
						2014-03-06 15:24:07 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ef94861c2d 
							
						 
					 
					
						
						
							
							It's 2014 now, dontchaknow  
						
						
						
					 
					
						2014-03-06 09:25:18 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c1148241ee 
							
						 
					 
					
						
						
							
							Version 2.3.13  
						
						
						
					 
					
						2014-03-06 09:01:05 +00:00 
						 
				 
			
				
					
						
							
							
								Eric Buehl 
							
						 
					 
					
						
						
						
						
							
						
						
							e0682e9298 
							
						 
					 
					
						
						
							
							don't implicitly import provider.oauth2  
						
						
						
					 
					
						2014-03-05 17:15:52 +00:00 
						 
				 
			
				
					
						
							
							
								Rodolfo Carvalho 
							
						 
					 
					
						
						
						
						
							
						
						
							94fe03779b 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
					 
					
						2014-03-05 17:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								David Larlet 
							
						 
					 
					
						
						
						
						
							
						
						
							84e7bf6796 
							
						 
					 
					
						
						
							
							Update documentation of render methods (obj to data)  
						
						
						
					 
					
						2014-03-04 17:21:07 +01:00 
						 
				 
			
				
					
						
							
							
								David Larlet 
							
						 
					 
					
						
						
						
						
							
						
						
							07cb436d61 
							
						 
					 
					
						
						
							
							Typo in keywords arguments name  
						
						... 
						
						
						
						Because it matters ;) 
						
					 
					
						2014-03-04 16:32:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4edd39b2e4 
							
						 
					 
					
						
						
							
							Merge pull request  #1442  from Anton-Shutik/master  
						
						... 
						
						
						
						RelatedField default value handling fixed 
						
					 
					
						2014-03-04 15:26:34 +00:00 
						 
				 
			
				
					
						
							
							
								Anton Shutik 
							
						 
					 
					
						
						
						
						
							
						
						
							dea2766aba 
							
						 
					 
					
						
						
							
							Added tests for "get_default_value" function  
						
						
						
					 
					
						2014-03-04 13:11:54 +03:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							3d7cb72e0a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'reference/master' into feature/django_1_7  
						
						
						
					 
					
						2014-03-03 11:41:07 +01:00 
						 
				 
			
				
					
						
							
							
								hongfeiZhang 
							
						 
					 
					
						
						
						
						
							
						
						
							693d9d9c63 
							
						 
					 
					
						
						
							
							In the method permission_denied, did not use the request parameter.  
						
						
						
					 
					
						2014-03-01 11:37:31 +08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							22f225175f 
							
						 
					 
					
						
						
							
							Merge pull request  #1437  from Keats/master  
						
						... 
						
						
						
						Display the media type of the API response on the browsable API 
						
					 
					
						2014-02-28 11:55:45 +00:00 
						 
				 
			
				
					
						
							
							
								Anton Shutik 
							
						 
					 
					
						
						
						
						
							
						
						
							3c62f0efc3 
							
						 
					 
					
						
						
							
							RelatedField.get_default_value: return empty list if self.many==True  
						
						
						
					 
					
						2014-02-28 13:59:21 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c3c69f4304 
							
						 
					 
					
						
						
							
							Merge pull request  #1441  from dustinfarris/null-serialization  
						
						... 
						
						
						
						TestCases and POST/PUT'ing serialized data that contains `None` 
						
					 
					
						2014-02-28 09:27:27 +00:00 
						 
				 
			
				
					
						
							
							
								Val Neekman 
							
						 
					 
					
						
						
						
						
							
						
						
							818b4bf8b3 
							
						 
					 
					
						
						
							
							handle negative time value and prevent a divide by zero  
						
						
						
					 
					
						2014-02-27 12:27:54 -08:00 
						 
				 
			
				
					
						
							
							
								Dustin Farris 
							
						 
					 
					
						
						
						
						
							
						
						
							f126856f65 
							
						 
					 
					
						
						
							
							Allow 'None' to pass as a null value in RelatedFields  
						
						
						
					 
					
						2014-02-27 12:30:59 -05:00 
						 
				 
			
				
					
						
							
							
								Anton Shutik 
							
						 
					 
					
						
						
						
						
							
						
						
							1addd09e2b 
							
						 
					 
					
						
						
							
							RelatedField default value handling fixed  
						
						
						
					 
					
						2014-02-27 18:34:36 +03:00 
						 
				 
			
				
					
						
							
							
								Keats 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd0394e20 
							
						 
					 
					
						
						
							
							Display the media type of the API response on the browsable API  
						
						
						
					 
					
						2014-02-26 23:47:35 +00:00 
						 
				 
			
				
					
						
							
							
								Dustin Farris 
							
						 
					 
					
						
						
						
						
							
						
						
							505f1173d0 
							
						 
					 
					
						
						
							
							Demonstrate problem post/put'ing serialized data that contains 'None'  
						
						
						
					 
					
						2014-02-26 12:08:26 -05:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d328f1827d 
							
						 
					 
					
						
						
							
							Tweak comment wrapping.  
						
						
						
					 
					
						2014-02-18 12:30:55 +00:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							dca8b98356 
							
						 
					 
					
						
						
							
							Remove unnecessary else  
						
						
						
					 
					
						2014-02-18 12:28:02 +00:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							f22aeeb0a3 
							
						 
					 
					
						
						
							
							Refactor UpdateModelMixin.update  
						
						... 
						
						
						
						Reduce nesting, return early in error cases. 
						
					 
					
						2014-02-18 12:08:12 +00:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							b2f0f4fcf4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'reference/master' into feature/django_1_7  
						
						
						
					 
					
						2014-02-18 11:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							5ae94547bc 
							
						 
					 
					
						
						
							
							Moved the python_2_unicode_compatible into compat module.  
						
						
						
					 
					
						2014-02-18 11:42:17 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a06252f812 
							
						 
					 
					
						
						
							
							Merge pull request  #1397  from amezhenin/issue_1386  
						
						... 
						
						
						
						update regex for matching URLs, fixes issue #1386  
						
					 
					
						2014-02-13 16:27:19 +00:00 
						 
				 
			
				
					
						
							
							
								Artem Mezhenin 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd993d108 
							
						 
					 
					
						
						
							
							wrapper for smart_urlquote, issue  #1386  
						
						
						
					 
					
						2014-02-13 20:14:47 +04:00 
						 
				 
			
				
					
						
							
							
								Artem Mezhenin 
							
						 
					 
					
						
						
						
						
							
						
						
							08ec23268d 
							
						 
					 
					
						
						
							
							(I hope) tests are fixed, issue  #1386  
						
						
						
					 
					
						2014-02-13 19:39:53 +04:00 
						 
				 
			
				
					
						
							
							
								Artem Mezhenin 
							
						 
					 
					
						
						
						
						
							
						
						
							d00ea3bcac 
							
						 
					 
					
						
						
							
							change regex back, issue  #1386  
						
						
						
					 
					
						2014-02-13 18:59:05 +04:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							f1016441f5 
							
						 
					 
					
						
						
							
							Test and fix for  #1210 . World's lowest hanging fruit.  
						
						
						
					 
					
						2014-02-11 19:52:32 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							95670933d7 
							
						 
					 
					
						
						
							
							Test and quick fix for  #1257  
						
						
						
					 
					
						2014-02-11 14:44:56 +01:00 
						 
				 
			
				
					
						
							
							
								Hassan Shamim 
							
						 
					 
					
						
						
						
						
							
						
						
							97b7c25987 
							
						 
					 
					
						
						
							
							Replace 'detail' with 'default_detail' in Exceptions guide and APIException class docstring.  
						
						
						
					 
					
						2014-02-10 12:54:56 -06:00 
						 
				 
			
				
					
						
							
							
								Artem Mezhenin 
							
						 
					 
					
						
						
						
						
							
						
						
							35f4908e48 
							
						 
					 
					
						
						
							
							issue  #1386  
						
						... 
						
						
						
						* regex for matching URLs was rewritten
* added unittests 
						
					 
					
						2014-02-09 02:46:25 +04:00 
						 
				 
			
				
					
						
							
							
								Artem Mezhenin 
							
						 
					 
					
						
						
						
						
							
						
						
							41eb313e1c 
							
						 
					 
					
						
						
							
							update regex for matching URLs, fixes issue  #1386  
						
						
						
					 
					
						2014-02-09 01:01:05 +04:00 
						 
				 
			
				
					
						
							
							
								Matthew King 
							
						 
					 
					
						
						
						
						
							
						
						
							f8cda8adbd 
							
						 
					 
					
						
						
							
							Generate random token directly  
						
						
						
					 
					
						2014-02-04 22:50:11 -05:00 
						 
				 
			
				
					
						
							
							
								juroe 
							
						 
					 
					
						
						
						
						
							
						
						
							b182b9e246 
							
						 
					 
					
						
						
							
							Fixes typo (Implicit instead of Implict).  
						
						
						
					 
					
						2014-02-04 11:56:41 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8f921160e5 
							
						 
					 
					
						
						
							
							Merge pull request  #1377  from Ian-Foote/force_bytes  
						
						... 
						
						
						
						Import force_bytes on django >= 1.5 
						
					 
					
						2014-01-31 03:45:04 -08:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							5a662dd60e 
							
						 
					 
					
						
						
							
							Moving models back to test_serializer.  
						
						
						
					 
					
						2014-01-31 11:20:53 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							0043f30cab 
							
						 
					 
					
						
						
							
							Use bytes BOUNDARY on django < 1.5  
						
						... 
						
						
						
						Django's encode_multipart was updated in django 1.5 to work internally
with unicode and convert to bytes.
In django >= 1.5 we therefore need to pass the BOUNDARY as unicode. In
django < 1.5 we still need to pass it as bytes. 
						
					 
					
						2014-01-31 09:12:45 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							18f26ff5cc 
							
						 
					 
					
						
						
							
							Only add 'Vary: Accept' header when there is more than one possible renderer.  
						
						
						
					 
					
						2014-01-30 17:47:55 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9f0ead9597 
							
						 
					 
					
						
						
							
							Remove TODO note, since it hasn't been TODONE.  
						
						
						
					 
					
						2014-01-30 17:32:05 +00:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							73e5b7e4b2 
							
						 
					 
					
						
						
							
							Fixed the object representation in order to pass the tests.  
						
						
						
					 
					
						2014-01-30 14:27:46 +01:00