Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							092d5223eb 
							
						 
					 
					
						
						
							
							Fix searchfilter issues  
						
						
						
					 
					
						2013-05-15 10:29:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2f54decd3e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  
						
						
						
					 
					
						2013-05-14 21:41:39 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e939e1755a 
							
						 
					 
					
						
						
							
							Base automatic filterset model on the queryset model.   Fixes   #834 .  
						
						
						
					 
					
						2013-05-14 21:40:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3c434f6c 
							
						 
					 
					
						
						
							
							Merge pull request  #824  from jsummerfield/patch-1  
						
						... 
						
						
						
						Remove trailing unmatched </div> in login_base.html template. Reformat i... 
						
					 
					
						2013-05-14 10:36:31 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d62414147f 
							
						 
					 
					
						
						
							
							Fix assert messaging on fields/exclude checking.  Closes   #833  
						
						
						
					 
					
						2013-05-14 17:53:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a303d0f38c 
							
						 
					 
					
						
						
							
							Fix filter test renaming  
						
						
						
					 
					
						2013-05-14 11:37:59 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ce1a04a603 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/avinash240/django-rest-framework  
						
						
						
					 
					
						2013-05-14 11:34:47 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2cff6e69db 
							
						 
					 
					
						
						
							
							Added OrderingFilter  
						
						
						
					 
					
						2013-05-14 11:27:08 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6a037f63ed 
							
						 
					 
					
						
						
							
							Added OrderingFilter  
						
						
						
					 
					
						2013-05-14 11:27:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							08bc976269 
							
						 
					 
					
						
						
							
							Rename filter tests  
						
						
						
					 
					
						2013-05-14 10:16:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b2bf5f1f88 
							
						 
					 
					
						
						
							
							SearchFilter may be comma and/or whitespace seperated  
						
						
						
					 
					
						2013-05-14 10:10:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							752c01420f 
							
						 
					 
					
						
						
							
							Fix Django 1.3 compat with routers  
						
						
						
					 
					
						2013-05-14 10:01:05 +01:00 
						 
				 
			
				
					
						
							
							
								James Summerfield 
							
						 
					 
					
						
						
						
						
							
						
						
							5074bbe4b2 
							
						 
					 
					
						
						
							
							Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency.  
						
						
						
					 
					
						2013-05-13 07:51:23 +02:00 
						 
				 
			
				
					
						
							
							
								Marlon Bailey 
							
						 
					 
					
						
						
						
						
							
						
						
							5e2d8052d4 
							
						 
					 
					
						
						
							
							fix test case to work with Python 3 and make it more explicit  
						
						
						
					 
					
						2013-05-12 09:22:14 -04:00 
						 
				 
			
				
					
						
							
							
								Marlon Bailey 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2580dccf 
							
						 
					 
					
						
						
							
							added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base  
						
						
						
					 
					
						2013-05-11 22:26:34 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4a66cfc7 
							
						 
					 
					
						
						
							
							Fix py3k compat with functools.reduce  
						
						
						
					 
					
						2013-05-10 23:06:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dd51d369c8 
							
						 
					 
					
						
						
							
							Unicode string fix  
						
						
						
					 
					
						2013-05-10 23:02:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							293dc3e6d8 
							
						 
					 
					
						
						
							
							Added SearchFilter  
						
						
						
					 
					
						2013-05-10 22:33:11 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8ce36d2bf1 
							
						 
					 
					
						
						
							
							SearchFilter and tests  
						
						
						
					 
					
						2013-05-10 21:57:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							773a92eab3 
							
						 
					 
					
						
						
							
							Move models into test modules, out of models module  
						
						
						
					 
					
						2013-05-10 21:57:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0176a5391b 
							
						 
					 
					
						
						
							
							Fix HyperlinkedModelSerializer not respecting lookup_fields  
						
						
						
					 
					
						2013-05-09 17:09:40 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							939cc5adba 
							
						 
					 
					
						
						
							
							Tweak inheritance  
						
						
						
					 
					
						2013-05-09 13:35:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							31f94ab409 
							
						 
					 
					
						
						
							
							Added GenericViewSet and docs tweaking  
						
						
						
					 
					
						2013-05-09 13:31:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab7b8f257 
							
						 
					 
					
						
						
							
							Version 2.3.2  
						
						
						
					 
					
						2013-05-08 20:49:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b443560080 
							
						 
					 
					
						
						
							
							Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings.   Closes   #798  
						
						
						
					 
					
						2013-05-08 20:38:50 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							de69a28b9e 
							
						 
					 
					
						
						
							
							Test and fix for  #814 .  
						
						
						
					 
					
						2013-05-08 20:18:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							429e078eee 
							
						 
					 
					
						
						
							
							Allow None filename on uploaded files  
						
						
						
					 
					
						2013-05-08 20:07:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d7c08222f1 
							
						 
					 
					
						
						
							
							Fix breadcrumb rendering issue  
						
						
						
					 
					
						2013-05-07 14:11:48 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ed2cf180c9 
							
						 
					 
					
						
						
							
							Version 2.3.0  
						
						
						
					 
					
						2013-05-07 13:29:38 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3353889ae8 
							
						 
					 
					
						
						
							
							Docs for FileUploadParser  
						
						
						
					 
					
						2013-05-07 13:27:27 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							642970a1b8 
							
						 
					 
					
						
						
							
							Merge pull request  #806  from wronglink/master  
						
						... 
						
						
						
						Added FileUploadParser 
						
					 
					
						2013-05-07 05:09:09 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3c2bb06660 
							
						 
					 
					
						
						
							
							Support for multiple filter classes  
						
						
						
					 
					
						2013-05-07 13:00:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d71a5533f9 
							
						 
					 
					
						
						
							
							allow_empty -> pending deprecation in preference of overridden get_queryset.  
						
						
						
					 
					
						2013-05-07 12:25:41 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b70c9cc107 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2013-05-05 18:12:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							75b2afcb23 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 2.3  
						
						
						
					 
					
						2013-05-05 16:48:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							660d240517 
							
						 
					 
					
						
						
							
							.action attribute on viewsets  
						
						
						
					 
					
						2013-05-05 16:48:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							538d2e35e7 
							
						 
					 
					
						
						
							
							lookup_field on hyperlink serializers  
						
						
						
					 
					
						2013-05-05 16:47:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							a514232815 
							
						 
					 
					
						
						
							
							Raise ParseError if can't handle the uploaded file  
						
						
						
					 
					
						2013-05-04 17:18:41 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							e36e4f48ad 
							
						 
					 
					
						
						
							
							Codebase improvements on FileUploadParser  
						
						... 
						
						
						
						* Added docstrings.
* Added `FileUploadParser.get_filename` to make it easier to override.
* Added url kwargs filename detection step.
* Updated tests corresponding to these changes. 
						
					 
					
						2013-05-04 14:58:21 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							318fdaabe5 
							
						 
					 
					
						
						
							
							Tests for FileUploadParser  
						
						
						
					 
					
						2013-05-03 01:39:08 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							0c85768435 
							
						 
					 
					
						
						
							
							Added FileUploadParser refs  #7  
						
						
						
					 
					
						2013-05-03 01:37:25 +06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							387250bee4 
							
						 
					 
					
						
						
							
							Automagically determine base_name in router class  
						
						
						
					 
					
						2013-05-02 12:07:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e4067bfb75 
							
						 
					 
					
						
						
							
							introduce lookup_field and add pendingdeprecationwarnings  
						
						
						
					 
					
						2013-05-02 12:07:18 +01:00 
						 
				 
			
				
					
						
							
							
								Victor Shih 
							
						 
					 
					
						
						
						
						
							
						
						
							8cabae22c5 
							
						 
					 
					
						
						
							
							Example and spelling fixes. Change "browseable" to "browsable" for consistency.  
						
						
						
					 
					
						2013-05-01 21:26:40 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							35f99cddc4 
							
						 
					 
					
						
						
							
							lookup_field on hyperlinked fields, and overriddable hyperlinked fields.   Closes   #688  
						
						
						
					 
					
						2013-05-01 09:03:09 +01:00 
						 
				 
			
				
					
						
							
							
								Danilo Bargen 
							
						 
					 
					
						
						
						
						
							
						
						
							e5040fbf94 
							
						 
					 
					
						
						
							
							Catch ImproperlyConfigured exception in compat.py ( fixes   #803 )  
						
						
						
					 
					
						2013-04-30 23:24:33 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							22af28d146 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2013-04-30 19:32:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b65b065375 
							
						 
					 
					
						
						
							
							Add DjangoModelPermissionsOrAnonReadOnly  
						
						
						
					 
					
						2013-04-30 14:34:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8dff8d2fdc 
							
						 
					 
					
						
						
							
							Add get_breadcrumbs hook to BrowseableAPIRenderer.   Closes   #733 .  
						
						
						
					 
					
						2013-04-30 14:34:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							21ae3a6691 
							
						 
					 
					
						
						
							
							Drop out  attribute  
						
						
						
					 
					
						2013-04-30 08:24:33 +01:00