Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d8b05201ed 
							
						 
					 
					
						
						
							
							Merge branch 'restframework2' of  https://github.com/tomchristie/django-rest-framework  into restframework2  
						
						
						
					 
					
						2012-10-03 09:46:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1a05942166 
							
						 
					 
					
						
						
							
							Stopgap fix for model fields rendering in browseable API  
						
						
						
					 
					
						2012-10-03 09:45:27 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							637bfa0f8f 
							
						 
					 
					
						
						
							
							Merge pull request  #276  from mattbo/restframework2  
						
						... 
						
						
						
						Fixed references to serializer.serialized and serializer.serialized_erro... 
						
					 
					
						2012-10-03 01:32:14 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c30e0795be 
							
						 
					 
					
						
						
							
							Rename generic views  
						
						
						
					 
					
						2012-10-03 09:26:15 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Bosworth 
							
						 
					 
					
						
						
						
						
							
						
						
							934492ebd0 
							
						 
					 
					
						
						
							
							Fixed references to serializer.serialized and serializer.serialized_errors  
						
						... 
						
						
						
						in part 3 of the tutorial.  Altered part 1 to use blogs/urls.py since it was
specified at the beginning.  Also caught some spelling errors while I was at it. 
						
					 
					
						2012-10-02 22:41:03 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b89125ef53 
							
						 
					 
					
						
						
							
							Update view docs slightly  
						
						
						
					 
					
						2012-10-02 21:26:15 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							eaecffe211 
							
						 
					 
					
						
						
							
							Remove duff checkin  
						
						
						
					 
					
						2012-10-02 19:58:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e1518de68f 
							
						 
					 
					
						
						
							
							Merge branch 'restframework2' of  https://github.com/tomchristie/django-rest-framework  into restframework2  
						
						
						
					 
					
						2012-10-02 19:54:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							31b06f1721 
							
						 
					 
					
						
						
							
							Cleaner travis image link  
						
						
						
					 
					
						2012-10-02 19:54:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b99f350a 
							
						 
					 
					
						
						
							
							Added model form field -> serializer form field mapping  
						
						
						
					 
					
						2012-10-02 16:16:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f010a9553e 
							
						 
					 
					
						
						
							
							Add test to ensure that pk is readonly in PUT requests  
						
						
						
					 
					
						2012-10-02 15:39:41 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ab173fd8f9 
							
						 
					 
					
						
						
							
							Fix bug where pk could be set in post data  
						
						
						
					 
					
						2012-10-02 15:37:13 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e7685f3eb5 
							
						 
					 
					
						
						
							
							URL overrides in settings fixed up slightly  
						
						
						
					 
					
						2012-10-02 15:24:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8855a462c6 
							
						 
					 
					
						
						
							
							Clean up docs slightly  
						
						
						
					 
					
						2012-10-02 11:48:25 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b526b82abf 
							
						 
					 
					
						
						
							
							Placeholder for FBV docs  
						
						
						
					 
					
						2012-10-02 11:04:06 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							34637bf857 
							
						 
					 
					
						
						
							
							Make example more realistic and less of a toy  
						
						
						
					 
					
						2012-10-02 11:03:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8a827004 
							
						 
					 
					
						
						
							
							Make 'results_field' attribute of BasePaginationSerializer public.  
						
						
						
					 
					
						2012-10-02 10:40:43 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2284e592de 
							
						 
					 
					
						
						
							
							Clean up reverse docs slightly  
						
						
						
					 
					
						2012-10-02 10:40:04 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a8f6ac3f3a 
							
						 
					 
					
						
						
							
							Renderer documentation  
						
						
						
					 
					
						2012-10-02 10:39:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dae6d09398 
							
						 
					 
					
						
						
							
							Add example of using paginator in a view  
						
						
						
					 
					
						2012-10-01 16:27:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8d1d990187 
							
						 
					 
					
						
						
							
							Pagination docs  
						
						
						
					 
					
						2012-10-01 16:17:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1d432cf432 
							
						 
					 
					
						
						
							
							Merge pull request  #274  from tomchristie/pagination  
						
						... 
						
						
						
						Expand pagination support, add docs 
						
					 
					
						2012-10-01 07:56:19 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b16fb57771 
							
						 
					 
					
						
						
							
							Expand pagination support, add docs  
						
						
						
					 
					
						2012-10-01 15:49:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1ace8d6eea 
							
						 
					 
					
						
						
							
							Merge pull request  #273  from tomchristie/pagination  
						
						... 
						
						
						
						Pagination support 
						
					 
					
						2012-09-30 09:35:26 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6fa589fefd 
							
						 
					 
					
						
						
							
							Pagination support  
						
						
						
					 
					
						2012-09-30 17:31:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							43d3634e89 
							
						 
					 
					
						
						
							
							Docs tweaking  
						
						
						
					 
					
						2012-09-30 15:55:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							616e6f5f4d 
							
						 
					 
					
						
						
							
							Drop oauth tests for now - may pull same test module back in if end up using django-oauth-plus, but since we've not pulled it in right now...  
						
						
						
					 
					
						2012-09-28 17:09:30 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							224bc027cd 
							
						 
					 
					
						
						
							
							Add more tests for generic views  
						
						
						
					 
					
						2012-09-28 16:41:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0853316545 
							
						 
					 
					
						
						
							
							Add more tests for generic views  
						
						
						
					 
					
						2012-09-28 16:23:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6cf2874cf2 
							
						 
					 
					
						
						
							
							Clean up reverse tests  
						
						
						
					 
					
						2012-09-28 16:09:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c2bbe628e6 
							
						 
					 
					
						
						
							
							Fix coverage to not include migrations  
						
						
						
					 
					
						2012-09-28 16:01:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9f71f8e618 
							
						 
					 
					
						
						
							
							Fix broken bits of generic views  
						
						
						
					 
					
						2012-09-28 15:54:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ebd701be7 
							
						 
					 
					
						
						
							
							Fix serialization issue with Django 1.3  
						
						
						
					 
					
						2012-09-28 14:53:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							25cbff5fab 
							
						 
					 
					
						
						
							
							Remove unused test file  
						
						
						
					 
					
						2012-09-28 14:29:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e003cc91b6 
							
						 
					 
					
						
						
							
							Get test-only models properly working  
						
						
						
					 
					
						2012-09-28 14:28:50 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							84f7758039 
							
						 
					 
					
						
						
							
							Remove support for doctests  
						
						
						
					 
					
						2012-09-28 11:53:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							aeeb68f68a 
							
						 
					 
					
						
						
							
							Added @j4mie, and added projects to 'additional thanks' as appropriate.  
						
						
						
					 
					
						2012-09-28 10:42:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							549d50b956 
							
						 
					 
					
						
						
							
							More simple travis link style  
						
						
						
					 
					
						2012-09-28 10:11:29 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							62ccc1a306 
							
						 
					 
					
						
						
							
							Fix failing tests  
						
						
						
					 
					
						2012-09-28 10:11:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ee36e4ab0c 
							
						 
					 
					
						
						
							
							Only display forms when user has permissions.   #159  
						
						
						
					 
					
						2012-09-27 21:51:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b2259bad6b 
							
						 
					 
					
						
						
							
							Merge pull request  #270  from phobologic/master  
						
						... 
						
						
						
						Prevent serialization from recursing to self 
						
					 
					
						2012-09-27 05:49:34 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							49d2ea7cc0 
							
						 
					 
					
						
						
							
							Remove erronous checkins  
						
						
						
					 
					
						2012-09-27 13:47:06 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							689d2afd97 
							
						 
					 
					
						
						
							
							Breadcrumbs play nicely when app not installed at root URL.   Fixes   #211  
						
						
						
					 
					
						2012-09-27 13:46:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4d906938a9 
							
						 
					 
					
						
						
							
							Merge branch 'restframework2' of  https://github.com/tomchristie/django-rest-framework  into restframework2  
						
						
						
					 
					
						2012-09-27 13:34:48 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							284a700e09 
							
						 
					 
					
						
						
							
							head method on views for Django 1.3.   Fixes   #228  
						
						
						
					 
					
						2012-09-27 13:34:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8582b18ac4 
							
						 
					 
					
						
						
							
							Added @cyberj.  Thanks!  
						
						
						
					 
					
						2012-09-27 14:29:14 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f3e7acde14 
							
						 
					 
					
						
						
							
							Rename category_dir to relative_dir  
						
						
						
					 
					
						2012-09-27 14:27:40 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							049452d906 
							
						 
					 
					
						
						
							
							Merge pull request  #271  from cyberj/restframework2  
						
						... 
						
						
						
						Fix mkdocs bug with relative/abs path 
						
					 
					
						2012-09-27 05:25:58 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d2583b809c 
							
						 
					 
					
						
						
							
							Remove parse_qs from compat, now py2.5 support is dropped  
						
						
						
					 
					
						2012-09-27 13:08:57 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							89a0b22306 
							
						 
					 
					
						
						
							
							Merge branch 'restframework2' of  https://github.com/tomchristie/django-rest-framework  into restframework2  
						
						
						
					 
					
						2012-09-27 13:06:34 +01:00