José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							3e20b0110c 
							
						 
					 
					
						
						
							
							Fix linting issues  
						
						
						
					 
					
						2014-09-05 15:58:42 -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 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							959e234260 
							
						 
					 
					
						
						
							
							Move parser tests to correct directory  
						
						
						
					 
					
						2014-09-05 15:33:47 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							c8e475023c 
							
						 
					 
					
						
						
							
							Fix encoded filename parsing to allow for lang  
						
						
						
					 
					
						2014-09-05 15:22:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd8a24db1 
							
						 
					 
					
						
						
							
							Refactor encoded filename feature per  #1531  
						
						
						
					 
					
						2014-09-05 14:56:54 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							bcca9ed0fd 
							
						 
					 
					
						
						
							
							Removed use encoding available only in py3  
						
						
						
					 
					
						2014-09-05 14:52:01 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							644f9b5421 
							
						 
					 
					
						
						
							
							Removed assert for wrong charset  
						
						
						
					 
					
						2014-09-05 14:51:31 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							6e90dad8e3 
							
						 
					 
					
						
						
							
							Added test for encoded filename  
						
						
						
					 
					
						2014-09-05 14:51:07 -07:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vlastovskiy 
							
						 
					 
					
						
						
						
						
							
						
						
							8a9f34b838 
							
						 
					 
					
						
						
							
							Added get filename as encoded  
						
						... 
						
						
						
						This filename described in RFC 6266 
						
					 
					
						2014-09-05 14:50:16 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e02446f9 
							
						 
					 
					
						
						
							
							Merge pull request  #1836  from jpadilla/filter-ordering  
						
						... 
						
						
						
						Preserve default ordering when using filtering 
						
					 
					
						2014-09-05 20:34:43 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							ab213cbc41 
							
						 
					 
					
						
						
							
							Remove order_by from AutoFilterSet  
						
						
						
					 
					
						2014-09-05 11:43:49 -07:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							5add55abc8 
							
						 
					 
					
						
						
							
							Failing test case for  #1432  
						
						
						
					 
					
						2014-09-05 11:33:54 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d934824bff 
							
						 
					 
					
						
						
							
							Workin on  
						
						
						
					 
					
						2014-09-05 16:29:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2b47c6b700 
							
						 
					 
					
						
						
							
							Merge pull request  #1834  from piotrjakimiak/master  
						
						... 
						
						
						
						Fix returning None when allow_none is True in CharField 
						
					 
					
						2014-09-05 13:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3cc00edd 
							
						 
					 
					
						
						
							
							Delete useless assert  
						
						
						
					 
					
						2014-09-05 14:36:35 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4207d44531 
							
						 
					 
					
						
						
							
							Update requirements.txt  
						
						
						
					 
					
						2014-09-05 13:19:47 +01:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b841ae44 
							
						 
					 
					
						
						
							
							Use Serializer instead of ModelSerializer  
						
						
						
					 
					
						2014-09-05 14:08:11 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							7dce364a35 
							
						 
					 
					
						
						
							
							Merge pull request  #1829  from cezar77/login-form-errors  
						
						... 
						
						
						
						Display validation errors on login form 
						
					 
					
						2014-09-05 12:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							2531b5cd86 
							
						 
					 
					
						
						
							
							Remove light gray bordering from the well with general message error  
						
						
						
					 
					
						2014-09-05 13:28:47 +02:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							6022b9ddd4 
							
						 
					 
					
						
						
							
							Fix comment  
						
						
						
					 
					
						2014-09-05 12:00:17 +02:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							e39422e35f 
							
						 
					 
					
						
						
							
							Check object in tests  
						
						
						
					 
					
						2014-09-05 11:27:36 +02:00 
						 
				 
			
				
					
						
							
							
								Piotr Jakimiak 
							
						 
					 
					
						
						
						
						
							
						
						
							d9633c6817 
							
						 
					 
					
						
						
							
							Fix returning None when allow_none is True in CharField  
						
						
						
					 
					
						2014-09-05 11:08:34 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							34b3ee9ea1 
							
						 
					 
					
						
						
							
							Place general error message in well  
						
						
						
					 
					
						2014-09-05 11:06:30 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ee26ba99 
							
						 
					 
					
						
						
							
							Change bootstrap class warning to error  
						
						
						
					 
					
						2014-09-05 10:55:49 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2e632e5af2 
							
						 
					 
					
						
						
							
							Merge pull request  #1820  from carltongibson/login-dropdown  
						
						... 
						
						
						
						Hide login link in browsable API if the login view is not registered. 
						
					 
					
						2014-09-05 09:07:14 +01:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							6106701c06 
							
						 
					 
					
						
						
							
							Input fields get hightlighted if login fails and username is persisted  
						
						
						
					 
					
						2014-09-05 09:38:54 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							29bcce7013 
							
						 
					 
					
						
						
							
							Merge pull request  #1833  from dpanesso/master  
						
						... 
						
						
						
						Using user.get_username() instead of user.username. 
						
					 
					
						2014-09-04 22:59:37 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							3bc858c30b 
							
						 
					 
					
						
						
							
							General message error goes above submit button  
						
						
						
					 
					
						2014-09-04 17:51:45 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							ea259e8bde 
							
						 
					 
					
						
						
							
							Error messages are displayed below the input fields  
						
						
						
					 
					
						2014-09-04 16:01:27 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							d56efb8f82 
							
						 
					 
					
						
						
							
							Display validation errors on login form  
						
						
						
					 
					
						2014-09-04 15:26:00 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1fb3d8df 
							
						 
					 
					
						
						
							
							Prefer format and use named blocks  
						
						
						
					 
					
						2014-09-04 08:54:50 +02:00 
						 
				 
			
				
					
						
							
							
								dpanesso 
							
						 
					 
					
						
						
						
						
							
						
						
							1ab782a430 
							
						 
					 
					
						
						
							
							Using user.get_username() instead of user.username.  
						
						... 
						
						
						
						This solves an error when using a auth model that does not have a username field. 
						
					 
					
						2014-09-03 23:38:03 -05:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							840fe7b05c 
							
						 
					 
					
						
						
							
							Merge pull request  #1706  from pipermerriam/piper/use_decorator_mixin_class  
						
						... 
						
						
						
						Alter CSRF exemption implementation 
						
					 
					
						2014-09-03 18:49:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							415b33b49f 
							
						 
					 
					
						
						
							
							Merge pull request  #1827  from jpadilla/master  
						
						... 
						
						
						
						Test with released Django 1.7 
						
					 
					
						2014-09-03 18:48:51 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							fc250bf74b 
							
						 
					 
					
						
						
							
							Test with released Django 1.7  
						
						
						
					 
					
						2014-09-03 09:58:21 -07:00 
						 
				 
			
				
					
						
							
							
								Piper Merriam 
							
						 
					 
					
						
						
						
						
							
						
						
							fc9be55d43 
							
						 
					 
					
						
						
							
							Alter CSRF exemption implementation  
						
						... 
						
						
						
						The previous implementation of decorating `APIView.dispach` with the
`csrf_exempt` decorator allowed for an easy-to-make mistake where
someone could override the `dispatch` method on a view and inadvertantly
remove the csrf exemption of their api view.
By moving the decoration of the view into the `as_view` logic, it
becomes much more difficult to make this mistake. 
						
					 
					
						2014-09-03 09:50:31 -06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f08afe162c 
							
						 
					 
					
						
						
							
							Version 2.4.2  
						
						
						
					 
					
						2014-09-03 16:35:17 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c1036c1753 
							
						 
					 
					
						
						
							
							More test passing  
						
						
						
					 
					
						2014-09-03 16:34:09 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							560f428e24 
							
						 
					 
					
						
						
							
							Merge pull request  #1826  from swistakm/fix/explicit-many-in-pagination-serializer-results  
						
						... 
						
						
						
						Use explicit `many=True` in PaginationSerializer on `object_serializer` instantiation 
						
					 
					
						2014-09-03 16:33:42 +01:00 
						 
				 
			
				
					
						
							
							
								Michał Jaworski 
							
						 
					 
					
						
						
						
						
							
						
						
							afe9b37f60 
							
						 
					 
					
						
						
							
							remove rogue print  
						
						
						
					 
					
						2014-09-03 17:21:56 +02:00 
						 
				 
			
				
					
						
							
							
								Michał Jaworski 
							
						 
					 
					
						
						
						
						
							
						
						
							9195ccb97f 
							
						 
					 
					
						
						
							
							Use explicit many=True for object_serializer instantiation in PaginationSerializer and add catch dummy 'many' kwarg on DefaultObjectSerializer  
						
						
						
					 
					
						2014-09-03 16:52:41 +02:00 
						 
				 
			
				
					
						
							
							
								Michał Jaworski 
							
						 
					 
					
						
						
						
						
							
						
						
							deb19272b7 
							
						 
					 
					
						
						
							
							Add custom pagination test that covers case with custom object serializer class  
						
						
						
					 
					
						2014-09-03 16:49:32 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							4947303f20 
							
						 
					 
					
						
						
							
							Moved li tags inside optional_login  
						
						... 
						
						
						
						as per https://github.com/tomchristie/django-rest-framework/pull/1820#discussion_r16987993  
						
					 
					
						2014-09-03 09:54:36 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f2852811f9 
							
						 
					 
					
						
						
							
							Getting tests passing  
						
						
						
					 
					
						2014-09-02 17:41:23 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ec096a1cac 
							
						 
					 
					
						
						
							
							Add relations and get tests running  
						
						
						
					 
					
						2014-09-02 15:07:56 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							1e491c82e6 
							
						 
					 
					
						
						
							
							Fix imports  
						
						
						
					 
					
						2014-09-02 15:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							4836afa89f 
							
						 
					 
					
						
						
							
							Fix docstring  
						
						
						
					 
					
						2014-09-02 15:11:23 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							1967f525aa 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:tomchristie/django-rest-framework into login-dropdown  
						
						
						
					 
					
						2014-09-02 14:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							fa0ef17737 
							
						 
					 
					
						
						
							
							Remove Login Dropdown when Auth Views are not registered.  
						
						... 
						
						
						
						Fixes  #1738  
					
						2014-09-02 14:53:37 +02:00 
						 
				 
			
				
					
						
							
							
								Timo Tuominen 
							
						 
					 
					
						
						
						
						
							
						
						
							e437520217 
							
						 
					 
					
						
						
							
							Generator implementation of class mapping.  
						
						
						
					 
					
						2014-09-01 17:02:48 +03:00