| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Tom Christie | 4e9ebb5fe9 | cd back to parent directory | 2014-12-08 16:38:17 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 302ec59a5c | Merge pull request #2165 from phalt/httpie-examples Use httpie for tutorials | 2014-12-08 15:51:19 +00:00 |  | 
			
				
					| 
							
							
								 phalt | f3ebac061e | one last tabs / spaces! | 2014-12-08 15:47:49 +00:00 |  | 
			
				
					| 
							
							
								 phalt | 8e9408115d | fixed indentations | 2014-12-08 15:41:01 +00:00 |  | 
			
				
					| 
							
							
								 Xavier Ordoquy | e4820d611b | Fix the new Django default db name PrimaryKeyRelatedField now needs a queryset argument.
urls now don't use urlpatterns. | 2014-12-06 10:58:17 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b7b0fd3e14 | Added .validated_data usage. Closes #2214. | 2014-12-05 12:48:12 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 1b8c06aefe | Style tweaks in examples | 2014-12-05 12:46:08 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e2b3908834 | Fix quickstart tutorial | 2014-12-05 09:44:01 +00:00 |  | 
			
				
					| 
							
							
								 Xavier Ordoquy | 9d078be59c | Fix the tutorial against the v3.0 | 2014-12-04 23:34:55 +01:00 |  | 
			
				
					| 
							
							
								 Xavier Ordoquy | 38e05e66c9 | print() function works from Python 2.6 to 3.X | 2014-12-04 23:22:00 +01:00 |  | 
			
				
					| 
							
							
								 phalt | fcbae5d99f | updates based on suggestions | 2014-12-04 11:20:33 +00:00 |  | 
			
				
					| 
							
							
								 Martin Tschammer | ab25d706c7 | Renamed validated_attrs to validated_data to be more in line with other similar code. | 2014-12-03 23:52:35 +01:00 |  | 
			
				
					| 
							
							
								 phalt | a17d5d2b0b | remove unsused link | 2014-12-02 16:11:43 +00:00 |  | 
			
				
					| 
							
							
								 phalt | 515060a6ab | Only show pip install for httpie | 2014-12-02 10:16:41 +00:00 |  | 
			
				
					| 
							
							
								 phalt | 34b5db62e5 | Use httpie for tutorials | 2014-12-01 13:39:53 +00:00 |  | 
			
				
					| 
							
							
								 Tymur Maryokhin | e2ea98e8ab | Fixed typos | 2014-11-29 20:23:55 +01:00 |  | 
			
				
					| 
							
							
								 José Padilla | 731c8421af | Remove YAML support from core | 2014-11-29 14:43:05 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d4b8e356b9 | Merge branch '3.0-docs' | 2014-11-28 09:57:02 +00:00 |  | 
			
				
					| 
							
							
								 Will Stott | d0e245baba | grammar | 2014-11-26 15:51:28 +00:00 |  |