craigglennie 
							
						 
					 
					
						
						
						
						
							
						
						
							2d7d3b79a0 
							
						 
					 
					
						
						
							
							Make code block consistent in serialization tutorial  
						
						... 
						
						
						
						All the other code blocks in the Serialization tutorial can be copied and pasted, but there is one that includes the >>> shell prompt characters. This commit removes those characters, and also makes the output consistent with other code blocks by making it a comment. 
						
					 
					
						2016-01-02 13:15:25 -08:00 
						 
				 
			
				
					
						
							
							
								Peter Baehr 
							
						 
					 
					
						
						
						
						
							
						
						
							44ae037e81 
							
						 
					 
					
						
						
							
							Move urls.py changes down and add necessary import  
						
						... 
						
						
						
						The previous location of editting urls.py did not allow migrations to be created and the default import needs to be modified 
						
					 
					
						2015-12-15 21:17:52 -05:00 
						 
				 
			
				
					
						
							
							
								knbk 
							
						 
					 
					
						
						
						
						
							
						
						
							e203967e09 
							
						 
					 
					
						
						
							
							Add app_name to rest_framework.urls.  
						
						... 
						
						
						
						This allows users in Django 1.9+ to include the authentication urls
without specifying the namespace, as in:
    urlpatterns = [
        ...
        url(r'^auth/', include('rest_framework.urls'))
    ] 
						
					 
					
						2015-12-08 02:25:00 +01:00 
						 
				 
			
				
					
						
							
							
								qqbuby 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa16caffe 
							
						 
					 
					
						
						
							
							append a space after the comment mark to remain consistent with the other parts of the tutorial  
						
						
						
					 
					
						2015-09-13 20:24:22 +08:00 
						 
				 
			
				
					
						
							
							
								qqbuby 
							
						 
					 
					
						
						
						
						
							
						
						
							1a8f9d0a0f 
							
						 
					 
					
						
						
							
							fix issue  #3395  to correct the output text at line 184in docs/tutorial/1-serialization.md  
						
						
						
					 
					
						2015-09-12 01:36:40 +08:00 
						 
				 
			
				
					
						
							
							
								potpath 
							
						 
					 
					
						
						
						
						
							
						
						
							bb95de13bf 
							
						 
					 
					
						
						
							
							Update 6-viewsets-and-routers.md  
						
						
						
					 
					
						2015-09-04 16:07:20 +07:00 
						 
				 
			
				
					
						
							
							
								ThaJay 
							
						 
					 
					
						
						
						
						
							
						
						
							76fedcc348 
							
						 
					 
					
						
						
							
							Update 2-requests-and-responses.md  
						
						... 
						
						
						
						just a small error, the trailing slash in the url should be omitted when adding a .suffix 
						
					 
					
						2015-08-12 19:49:43 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c8ad0cce19 
							
						 
					 
					
						
						
							
							Bump minimum Django version to 1.5  
						
						
						
					 
					
						2015-07-30 15:43:39 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a4e0f03050 
							
						 
					 
					
						
						
							
							Tweak quickstart to show newest users first in list view  
						
						
						
					 
					
						2015-07-30 14:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7f7e6b33ff 
							
						 
					 
					
						
						
							
							Update quickstart.md  
						
						... 
						
						
						
						Closes  #3171  
					
						2015-07-19 21:47:09 -04:00 
						 
				 
			
				
					
						
							
							
								Leonardo Giordani 
							
						 
					 
					
						
						
						
						
							
						
						
							4f6eba3ce8 
							
						 
					 
					
						
						
							
							Removed import of unused django.forms.widgets  
						
						
						
					 
					
						2015-07-16 16:25:01 +02:00 
						 
				 
			
				
					
						
							
							
								Mark Skipper 
							
						 
					 
					
						
						
						
						
							
						
						
							b743818430 
							
						 
					 
					
						
						
							
							Remove unused import from docs example  
						
						
						
					 
					
						2015-07-01 20:39:05 +01:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							2b6726e703 
							
						 
					 
					
						
						
							
							Merge pull request  #2842  from frnc/patch-1  
						
						... 
						
						
						
						Update 5-relationships-and-hyperlinked-apis.md 
						
					 
					
						2015-04-26 12:13:57 -04:00 
						 
				 
			
				
					
						
							
							
								Valentin Hăloiu 
							
						 
					 
					
						
						
						
						
							
						
						
							e148637d6d 
							
						 
					 
					
						
						
							
							Frontpage example no longer uses model attribute  
						
						
						
					 
					
						2015-04-23 04:44:10 +03:00 
						 
				 
			
				
					
						
							
							
								frnc 
							
						 
					 
					
						
						
						
						
							
						
						
							601cbf18d4 
							
						 
					 
					
						
						
							
							Update 5-relationships-and-hyperlinked-apis.md  
						
						... 
						
						
						
						Following  [@jpadilla](https://github.com/jpadilla )'s suggestion in issue [#2837 ](https://github.com/tomchristie/django-rest-framework/issues/2837 ), I am proposing a little addition in "Creating an endpoint for the root of our API" section in order to make it clear that the `user-list` and `snippet-list` names will be declared later in `snippets/urls.py`. Missing this clarification might lead a beginner (like me) to think that the names are somehow assigned by rest_framework under the hood and to try the code too early, getting stuck in the following errors. 
						
					 
					
						2015-04-20 17:56:04 +02:00 
						 
				 
			
				
					
						
							
							
								Oleg Marshev 
							
						 
					 
					
						
						
						
						
							
						
						
							b0dd1fffbf 
							
						 
					 
					
						
						
							
							Fix typo.  
						
						
						
					 
					
						2015-04-07 19:40:23 +03:00 
						 
				 
			
				
					
						
							
							
								Kyle P. Johnson 
							
						 
					 
					
						
						
						
						
							
						
						
							d655a423fb 
							
						 
					 
					
						
						
							
							Add necessary imports to final urls.py example  
						
						
						
					 
					
						2015-03-16 11:17:02 -04:00 
						 
				 
			
				
					
						
							
							
								Esmail 
							
						 
					 
					
						
						
						
						
							
						
						
							2484dbf4e1 
							
						 
					 
					
						
						
							
							Fix example of explicit format URL (for real).  
						
						... 
						
						
						
						Do what I meant to do in #2670 :
The link is displayed in the tutorial as "http://example.com/api/items/4.json " but the hyperlink itself and what the example code actually works with are (in my opinion, less pretty) URLs like "http://example.com/api/items/4/.json ". 
						
					 
					
						2015-03-11 12:00:19 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							18cc0230bf 
							
						 
					 
					
						
						
							
							Clean up pagination attributes  
						
						
						
					 
					
						2015-03-04 15:51:00 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fbb21caaaa 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-02-09 20:43:50 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							235b98e427 
							
						 
					 
					
						
						
							
							Merge pull request  #2460  from mmarvick/master  
						
						... 
						
						
						
						Small fixes to the tutorial 
						
					 
					
						2015-02-06 11:31:25 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Marvick 
							
						 
					 
					
						
						
						
						
							
						
						
							5bf803b6ed 
							
						 
					 
					
						
						
							
							Revert some of the changes made in 1-serialization.md  
						
						
						
					 
					
						2015-02-05 19:42:36 -08:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa1fcd5d1 
							
						 
					 
					
						
						
							
							Fixes   #2493  
						
						
						
					 
					
						2015-02-01 16:18:02 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Marvick 
							
						 
					 
					
						
						
						
						
							
						
						
							73bd0d539f 
							
						 
					 
					
						
						
							
							tutorial  #5  incorrectly referenced 'settings.py' instead of 'tutorial/settings.py'  
						
						
						
					 
					
						2015-01-25 23:47:01 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Marvick 
							
						 
					 
					
						
						
						
						
							
						
						
							2a6937f381 
							
						 
					 
					
						
						
							
							tutorial  #2  incorrectly showed /item.json instead of /item/.json for format suffixes  
						
						
						
					 
					
						2015-01-25 23:46:27 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Marvick 
							
						 
					 
					
						
						
						
						
							
						
						
							90c9968a70 
							
						 
					 
					
						
						
							
							tutorial  #1  incorrectly showed string of json instead of ReturnDict type from 'serializer.data', and also has a third item in the second usage  
						
						
						
					 
					
						2015-01-25 23:45:56 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec08ce578 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-01-21 13:12:14 +00:00 
						 
				 
			
				
					
						
							
							
								Eric Theise 
							
						 
					 
					
						
						
						
						
							
						
						
							b0bc79ed4d 
							
						 
					 
					
						
						
							
							correcting "it's" to "its" in Tutorial 1  
						
						
						
					 
					
						2015-01-19 14:49:36 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6065cdbd93 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2015-01-19 15:16:57 +00:00 
						 
				 
			
				
					
						
							
							
								Travis Swientek 
							
						 
					 
					
						
						
						
						
							
						
						
							8ccf5bcc0b 
							
						 
					 
					
						
						
							
							Tweaked a few issues in the tutorial documentation.  
						
						
						
					 
					
						2015-01-09 11:36:21 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6168f60ba8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.1  
						
						
						
					 
					
						2015-01-05 11:02:28 +00:00 
						 
				 
			
				
					
						
							
							
								Rob Terhaar 
							
						 
					 
					
						
						
						
						
							
						
						
							336faf5a86 
							
						 
					 
					
						
						
							
							fix widget style formatting  
						
						
						
					 
					
						2015-01-01 21:01:16 -05:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d109ae0a2e 
							
						 
					 
					
						
						
							
							Merge pull request  #2010  from tanwanirahul/master  
						
						... 
						
						
						
						Ability to customize method names without creating a custom router 
						
					 
					
						2014-12-19 16:09:01 +00:00 
						 
				 
			
				
					
						
							
							
								Rahul 
							
						 
					 
					
						
						
						
						
							
						
						
							8f0fef4b75 
							
						 
					 
					
						
						
							
							Updated documentation on url_path per suggestions.  
						
						
						
					 
					
						2014-12-19 21:22:10 +05:30 
						 
				 
			
				
					
						
							
							
								tanwanirahul 
							
						 
					 
					
						
						
						
						
							
						
						
							a8a3fedb5c 
							
						 
					 
					
						
						
							
							Add url_path documention for detail_route decorator  
						
						
						
					 
					
						2014-12-19 20:16:46 +05:30 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c8d88c8c8a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.1  
						
						
						
					 
					
						2014-12-18 11:21:25 +00:00 
						 
				 
			
				
					
						
							
							
								Brent O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							7e9aac98fe 
							
						 
					 
					
						
						
							
							The pre_save method no longer works. This resolved issue  #2306  
						
						
						
					 
					
						2014-12-17 16:54:04 -06:00 
						 
				 
			
				
					
						
							
							
								Brent O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							4f33cfe1a0 
							
						 
					 
					
						
						
							
							With httpie 0.8.0 the HTTP method has to come after the auth argument.  
						
						
						
					 
					
						2014-12-17 14:38:01 -06:00 
						 
				 
			
				
					
						
							
							
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							eeb6e34064 
							
						 
					 
					
						
						
							
							Docs/tutorial import fixes. Refs  #2296  
						
						
						
					 
					
						2014-12-17 17:28:11 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							418108632c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  
						
						
						
					 
					
						2014-12-17 16:23:20 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							90b8f9221e 
							
						 
					 
					
						
						
							
							Use six.BytesIO in tutorial.  Closes   #2296 .  
						
						
						
					 
					
						2014-12-17 16:23:00 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5f933f575e 
							
						 
					 
					
						
						
							
							Merge pull request  #2298  from epicserve/fix_typo  
						
						... 
						
						
						
						Fixed a typo 
						
					 
					
						2014-12-17 16:20:22 +00:00 
						 
				 
			
				
					
						
							
							
								Brent O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							530f7a21b3 
							
						 
					 
					
						
						
							
							Fixed a typo  
						
						
						
					 
					
						2014-12-17 10:19:15 -06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1ba822010d 
							
						 
					 
					
						
						
							
							Highlight trailing '.' in command so it wont be missed.  
						
						
						
					 
					
						2014-12-17 15:22:27 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b6ee784240 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-12-15 12:18:55 +00:00 
						 
				 
			
				
					
						
							
							
								Jason Spafford 
							
						 
					 
					
						
						
						
						
							
						
						
							b951c74df2 
							
						 
					 
					
						
						
							
							Made docs consistent  
						
						
						
					 
					
						2014-12-15 01:24:12 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							baaa356489 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-12-12 15:37:43 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9b88b5db69 
							
						 
					 
					
						
						
							
							Field->ReadOnlyField in tutorial docs  
						
						
						
					 
					
						2014-12-11 09:54:55 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							76956beab4 
							
						 
					 
					
						
						
							
							snippets relationship in tutorial should be read_only  
						
						
						
					 
					
						2014-12-09 19:53:27 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							af3fe5a39f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  
						
						
						
					 
					
						2014-12-08 16:38:29 +00:00