Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9c41c007af 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py 
						
					 
					
						2013-12-13 16:32:34 +00:00 
						 
				 
			
				
					
						
							
							
								Jakub Roztočil 
							
						 
					 
					
						
						
						
						
							
						
						
							be55a3c5c7 
							
						 
					 
					
						
						
							
							Removed commented-out credits from footer to make django-debug-toolbar work.  
						
						... 
						
						
						
						The comment, although valid, caused that the Django debug toolbar's injected HTML was partially commented-out and thus the toolbar didn't work as expected. 
						
					 
					
						2013-10-24 17:53:02 +02:00 
						 
				 
			
				
					
						
							
							
								Omer Katz 
							
						 
					 
					
						
						
						
						
							
						
						
							d31fd33f4b 
							
						 
					 
					
						
						
							
							Allow to customize description so that markup can be accepted if needed.  
						
						
						
					 
					
						2013-10-16 09:15:02 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8d4ba478cc 
							
						 
					 
					
						
						
							
							Fix rendering of forms and add error rendering on HTML form  
						
						
						
					 
					
						2013-10-02 16:13:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a14f1e8864 
							
						 
					 
					
						
						
							
							Serializers can now be rendered directly to HTML  
						
						
						
					 
					
						2013-10-02 13:45:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e441f85109 
							
						 
					 
					
						
						
							
							Drop 1.3 support  
						
						
						
					 
					
						2013-09-25 10:30:04 +01:00 
						 
				 
			
				
					
						
							
							
								Tai Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							a9dbd46c94 
							
						 
					 
					
						
						
							
							Refs  #1109  -- Update docs. Integrate changes from feedback.  
						
						
						
					 
					
						2013-09-14 00:54:44 +10:00 
						 
				 
			
				
					
						
							
							
								Tai Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							bb3261ca48 
							
						 
					 
					
						
						
							
							Fixed   #1105  -- Add hook for custom context in BrowsableAPIRenderer.  
						
						... 
						
						
						
						Replace hard coded response status check with `allow_form` context
variable, so that it can be overridden in a custom renderer class. 
						
					 
					
						2013-09-13 23:11:44 +10:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							44f8d1bef2 
							
						 
					 
					
						
						
							
							Fix tab preferences on PUT forms  
						
						
						
					 
					
						2013-08-29 20:38:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1fa2d823cc 
							
						 
					 
					
						
						
							
							Preserve tab preference in cookies.  
						
						
						
					 
					
						2013-08-29 20:35:59 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0966a2680b 
							
						 
					 
					
						
						
							
							First pass at HTMLFormRenderer  
						
						
						
					 
					
						2013-08-23 14:38:31 +01:00 
						 
				 
			
				
					
						
							
							
								Yuri Prezument 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5f1bb229 
							
						 
					 
					
						
						
							
							Fix PATCH button title in template  
						
						
						
					 
					
						2013-08-12 15:44:00 +03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc3c37465 
							
						 
					 
					
						
						
							
							Merge and styling fixes  
						
						
						
					 
					
						2013-05-21 12:01:56 +01:00 
						 
				 
			
				
					
						
							
							
								Mark McArdle 
							
						 
					 
					
						
						
						
						
							
						
						
							611919aa0a 
							
						 
					 
					
						
						
							
							Initial commit of fix for  https://github.com/tomchristie/django-rest-framework/issues/775  
						
						
						
					 
					
						2013-05-18 13:10: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 
						 
				 
			
				
					
						
							
							
								forgingdestiny 
							
						 
					 
					
						
						
						
						
							
						
						
							03c736338f 
							
						 
					 
					
						
						
							
							extend base login template  
						
						
						
					 
					
						2013-04-17 10:15:02 -04:00 
						 
				 
			
				
					
						
							
							
								forgingdestiny 
							
						 
					 
					
						
						
						
						
							
						
						
							33f494fcc8 
							
						 
					 
					
						
						
							
							add branding and style blocks  
						
						
						
					 
					
						2013-04-17 10:14:36 -04:00 
						 
				 
			
				
					
						
							
							
								glic3rinu 
							
						 
					 
					
						
						
						
						
							
						
						
							92b5db5939 
							
						 
					 
					
						
						
							
							Added break_long_headers on templatetags and base template  
						
						
						
					 
					
						2013-04-04 12:11:04 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							048ef6a039 
							
						 
					 
					
						
						
							
							Polishing touches to  #663  
						
						
						
					 
					
						2013-02-22 08:39:26 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							2fb6fa2dd3 
							
						 
					 
					
						
						
							
							Minimal forms appearance improvements  
						
						
						
					 
					
						2013-02-20 17:15:12 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							533e472352 
							
						 
					 
					
						
						
							
							Added tabs between object form and generic content form on POST form  
						
						
						
					 
					
						2013-02-15 18:25:36 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							3195f72784 
							
						 
					 
					
						
						
							
							POST form using new form.html template  
						
						
						
					 
					
						2013-02-15 16:39:24 +06:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							8fdf925015 
							
						 
					 
					
						
						
							
							Added tabs between object form and generic content form on PUT/PATCH form  
						
						... 
						
						
						
						Some extra behaviour to `BrowsableAPIRenderer` to handle PATCH form.
Added PATCH button on generic content PUT form.
Tabs between object form and generic content form on PUT/PATCH form wich are
both allways visible now.
Fix  #570 
Refs #591  
						
					 
					
						2013-02-15 14:41:12 +06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4788c87b76 
							
						 
					 
					
						
						
							
							Fix mismatch between template blocks and docs.  
						
						... 
						
						
						
						Fixes  #639 . 
					
						2013-02-06 12:35:05 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Elovskikh 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5cc70cba 
							
						 
					 
					
						
						
							
							Login page styles fix.  Closes   #618 . Made with  🍪  
						
						
						
					 
					
						2013-01-28 18:01:44 +06:00 
						 
				 
			
				
					
						
							
							
								Johannes Spielmann 
							
						 
					 
					
						
						
						
						
							
						
						
							e67b23f1ac 
							
						 
					 
					
						
						
							
							correcting template: closing tag was missing  
						
						
						
					 
					
						2013-01-15 13:46:41 +01:00 
						 
				 
			
				
					
						
							
							
								Sebastien Beal 
							
						 
					 
					
						
						
						
						
							
						
						
							b1e6b58c97 
							
						 
					 
					
						
						
							
							missing rest_framework templatetags for statics in login template  
						
						
						
					 
					
						2012-12-30 13:24:05 +09:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							acdb69be52 
							
						 
					 
					
						
						
							
							Include 'static' template tag to enable 1.3 compatible staticfiles behaviour  
						
						
						
					 
					
						2012-12-28 12:36:28 +00:00 
						 
				 
			
				
					
						
							
							
								Roman Akinfold 
							
						 
					 
					
						
						
						
						
							
						
						
							5ae7786930 
							
						 
					 
					
						
						
							
							Replace get_static_prefix templatetag with static  
						
						... 
						
						
						
						so now static files urls in html view are correct if we use cloud
storage to serve static files 
						
					 
					
						2012-12-27 05:35:03 +08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							36e21153fb 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2012-11-01 23:11:28 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d327c5f531 
							
						 
					 
					
						
						
							
							Relational field support in browseable API.  
						
						... 
						
						
						
						Add slug relational fields.
Add quickstart. 
						
					 
					
						2012-11-01 23:04:13 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ee8ab283f0 
							
						 
					 
					
						
						
							
							Style tweaks  
						
						
						
					 
					
						2012-10-29 14:41:33 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dfcb560f8f 
							
						 
					 
					
						
						
							
							Fix up login styling  
						
						
						
					 
					
						2012-10-29 13:57:46 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							94401b43d2 
							
						 
					 
					
						
						
							
							Flesh out quickstart guide and make some style tweaks  
						
						
						
					 
					
						2012-10-09 13:50:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							7c4d50f621 
							
						 
					 
					
						
						
							
							Fix browseable API form display error for authenticated permissions  
						
						
						
					 
					
						2012-10-09 12:48:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							115e61be09 
							
						 
					 
					
						
						
							
							Added quickstart guide  
						
						
						
					 
					
						2012-10-09 12:01:17 +01:00 
						 
				 
			
				
					
						
							
							
								Max Hurl 
							
						 
					 
					
						
						
						
						
							
						
						
							101f06b50b 
							
						 
					 
					
						
						
							
							Added dabapps styling to html api  
						
						
						
					 
					
						2012-10-05 17:00:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a02707e12f 
							
						 
					 
					
						
						
							
							Tweaks  
						
						
						
					 
					
						2012-10-03 21:08:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							92b091ea16 
							
						 
					 
					
						
						
							
							Tweak styling of browseable API  
						
						
						
					 
					
						2012-10-03 16:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ee36e4ab0c 
							
						 
					 
					
						
						
							
							Only display forms when user has permissions.   #159  
						
						
						
					 
					
						2012-09-27 21:51:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							758bcf5b1e 
							
						 
					 
					
						
						
							
							Tweak browseable API  
						
						
						
					 
					
						2012-09-25 13:35:41 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d9cba6398e 
							
						 
					 
					
						
						
							
							Clean up bits of templates etc  
						
						
						
					 
					
						2012-09-20 17:44:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5a82aa9726 
							
						 
					 
					
						
						
							
							Clean up template tags  
						
						
						
					 
					
						2012-09-20 13:42:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4b691c4027 
							
						 
					 
					
						
						
							
							Change package name: djangorestframework -> rest_framework  
						
						
						
					 
					
						2012-09-20 13:06:27 +01:00