Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5bbfef36f4 
							
						 
					 
					
						
						
							
							Merge pull request  #1838  from jbittel/fix-encoded-filename-rfc6266  
						
						... 
						
						
						
						Support RFC6266 encoded filenames 
						
					 
					
						2014-09-06 07:13:12 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Bittel 
							
						 
					 
					
						
						
						
						
							
						
						
							3f7fad2e5a 
							
						 
					 
					
						
						
							
							Refactor disposition unpacking for clarity  
						
						
						
					 
					
						2014-09-05 16:27:55 -07:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							c9d4497d81 
							
						 
					 
					
						
						
							
							Use force_text from compat  
						
						
						
					 
					
						2014-09-05 15:58:53 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							8a9f34b838 
							
						 
					 
					
						
						
							
							Added get filename as encoded  
						
						... 
						
						
						
						This filename described in RFC 6266 
						
					 
					
						2014-09-05 14:50:16 -07:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							ab213cbc41 
							
						 
					 
					
						
						
							
							Remove order_by from AutoFilterSet  
						
						
						
					 
					
						2014-09-05 11:43:49 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							fa0ef17737 
							
						 
					 
					
						
						
							
							Remove Login Dropdown when Auth Views are not registered.  
						
						... 
						
						
						
						Fixes  #1738  
					
						2014-09-02 14:53:37 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							14877464f6 
							
						 
					 
					
						
						
							
							Merge pull request  #1816  from carltongibson/regression-login-template  
						
						... 
						
						
						
						Regression for #1810 : Test login view renders 
						
					 
					
						2014-09-01 10:31:07 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							55e779c856 
							
						 
					 
					
						
						
							
							Version 2.4.1  
						
						
						
					 
					
						2014-09-01 09:07:55 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							1c9c5d5c32 
							
						 
					 
					
						
						
							
							Regression for  #1810 : Test login view renders  
						
						
						
					 
					
						2014-09-01 10:07:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Roseman 
							
						 
					 
					
						
						
						
						
							
						
						
							b554c67d14 
							
						 
					 
					
						
						
							
							Restore body block to base template.  
						
						
						
					 
					
						2014-08-30 13:28:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2a61ed8bac 
							
						 
					 
					
						
						
							
							2.4 Release notes  
						
						
						
					 
					
						2014-08-29 10:10:17 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4ae06b3b 
							
						 
					 
					
						
						
							
							Merge pull request  #1784  from tomchristie/remove-model-attribute  
						
						... 
						
						
						
						Deprecate `.model` attribute on views 
						
					 
					
						2014-08-29 10:03:07 +01:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							5380889275 
							
						 
					 
					
						
						
							
							Validation errors in the rendered HTML fixed  
						
						
						
					 
					
						2014-08-28 10:39:01 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							e5d88a80a9 
							
						 
					 
					
						
						
							
							Put all TextNodes (method names) back to same line with parent element  
						
						
						
					 
					
						2014-08-27 09:41:33 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							f6cbd88618 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into fix-1719  
						
						... 
						
						
						
						Conflicts:
	rest_framework/templates/rest_framework/base.html 
						
					 
					
						2014-08-25 17:28:22 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							4d582fd9ff 
							
						 
					 
					
						
						
							
							Made all color declarations in bootstrap-tweaks.css consistent  
						
						
						
					 
					
						2014-08-22 10:12:52 +02:00 
						 
				 
			
				
					
						
							
							
								Cezar Pendarovski 
							
						 
					 
					
						
						
						
						
							
						
						
							1e2bd1294e 
							
						 
					 
					
						
						
							
							Fixed the issue with the non-draggable horizontal scrollbar  
						
						
						
					 
					
						2014-08-22 09:53:03 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4d8c63abc9 
							
						 
					 
					
						
						
							
							Deprecate .model in related routers/permissions  
						
						
						
					 
					
						2014-08-20 17:15:46 +01:00 
						 
				 
			
				
					
						
							
							
								Dmitry Mukhin 
							
						 
					 
					
						
						
						
						
							
						
						
							3b07d0c997 
							
						 
					 
					
						
						
							
							Merge branch 'master' into set-retry-after  
						
						... 
						
						
						
						Conflicts:
	tests/test_throttling.py 
						
					 
					
						2014-08-20 20:04:48 +04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9372cc8c31 
							
						 
					 
					
						
						
							
							Deprecate .model attribute on views  
						
						
						
					 
					
						2014-08-20 16:24:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							59b47eac14 
							
						 
					 
					
						
						
							
							Fix cache_throttle typo  
						
						
						
					 
					
						2014-08-20 12:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							63d02dbea8 
							
						 
					 
					
						
						
							
							Drop six from compat. 1.4.2 is now the lowest supported version.  
						
						
						
					 
					
						2014-08-19 17:06:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5358243ca5 
							
						 
					 
					
						
						
							
							Merge pull request  #1778  from linovia/bugfix/1398  
						
						... 
						
						
						
						Bugfix/1398 
						
					 
					
						2014-08-19 16:16:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2737f367 
							
						 
					 
					
						
						
							
							Resolve python3 linting issue  
						
						
						
					 
					
						2014-08-19 14:11:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d2795dd26d 
							
						 
					 
					
						
						
							
							Resolve linting issues  
						
						
						
					 
					
						2014-08-19 13:54:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							bf09c32de8 
							
						 
					 
					
						
						
							
							Code linting and added runtests.py  
						
						
						
					 
					
						2014-08-19 13:28:07 +01:00