José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							bc0c25df30 
							
						 
					 
					
						
						
							
							Consolidate Django and test requirements  
						
						
						
					 
					
						2014-12-01 17:31:11 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							05a86e3d65 
							
						 
					 
					
						
						
							
							Docs. Minor tweaks.  
						
						
						
					 
					
						2014-11-28 12:51:44 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							9b88c096e0 
							
						 
					 
					
						
						
							
							Remove Third party packages section  
						
						... 
						
						
						
						Information about Third party packages is already covered under the Third Party Resources topic 
						
					 
					
						2014-11-26 18:12:12 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c7701cd75a 
							
						 
					 
					
						
						
							
							Tweak  
						
						
						
					 
					
						2014-11-25 16:08:48 +00:00 
						 
				 
			
				
					
						
							
							
								Dougal Matthews 
							
						 
					 
					
						
						
						
						
							
						
						
							2ddef2d326 
							
						 
					 
					
						
						
							
							Drop simply from the mkdocs install lines  
						
						... 
						
						
						
						It is still simple tho', honest ;) 
						
					 
					
						2014-11-25 12:43:02 +00:00 
						 
				 
			
				
					
						
							
							
								Dougal Matthews 
							
						 
					 
					
						
						
						
						
							
						
						
							84d9c4b46e 
							
						 
					 
					
						
						
							
							Change site_dir to html to match mkdocs.py  
						
						
						
					 
					
						2014-11-25 12:42:39 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							d08cfb0559 
							
						 
					 
					
						
						
							
							Fix runtests examples  
						
						... 
						
						
						
						Correctly rename runtests examples to work with current runtests.py file. 
						
					 
					
						2014-11-17 08:17:40 -04:00 
						 
				 
			
				
					
						
							
							
								Jochen Van de Velde 
							
						 
					 
					
						
						
						
						
							
						
						
							440d61ab36 
							
						 
					 
					
						
						
							
							Fix some typos and other errors  
						
						
						
					 
					
						2014-11-08 11:02:48 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							159c3de9fc 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-10-31 15:19:15 +00:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							11edd01c34 
							
						 
					 
					
						
						
							
							Add docs regarding linking third party packages  
						
						
						
					 
					
						2014-10-17 08:58:31 -04:00 
						 
				 
			
				
					
						
							
							
								Craig de Stigter 
							
						 
					 
					
						
						
						
						
							
						
						
							dfab9af294 
							
						 
					 
					
						
						
							
							Minor: fix spelling and grammar, mostly in 3.0 announcement  
						
						
						
					 
					
						2014-10-03 08:41:18 +13:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							00c0dfc66f 
							
						 
					 
					
						
						
							
							Documentation on runtests.py  
						
						
						
					 
					
						2014-08-19 16:29:05 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							1797a74e82 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'pelme/pytest' into feature/pytest  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	rest_framework/runtests/runtests.py
	tests/test_filters.py
	tests/test_pagination.py
	tox.ini 
						
					 
					
						2014-04-17 09:53:44 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Pelme 
							
						 
					 
					
						
						
						
						
							
						
						
							971578ca34 
							
						 
					 
					
						
						
							
							Support for running the test suite with py.test  
						
						... 
						
						
						
						* Get rid of runtests.py
 * Moved test code  from rest_framework/tests and rest_framework/runtests to tests
 * Invoke py.test from setup.py
 * Invoke py.test from Travis
 * Invoke py.test from tox
 * Changed setUpClass to be just plain setUp in test_permissions.py
 * Updated contribution guideline to show how to invoke py.test 
						
					 
					
						2014-03-02 12:40:30 +01:00 
						 
				 
			
				
					
						
							
							
								Kumar McMillan 
							
						 
					 
					
						
						
						
						
							
						
						
							e2857bdcff 
							
						 
					 
					
						
						
							
							Fix link to tox  
						
						
						
					 
					
						2014-02-28 16:35:03 -06:00 
						 
				 
			
				
					
						
							
							
								Kumar McMillan 
							
						 
					 
					
						
						
						
						
							
						
						
							f5f4c1a837 
							
						 
					 
					
						
						
							
							strip trailing whitespace  
						
						... 
						
						
						
						my editor does this by default 
						
					 
					
						2014-02-28 16:34:42 -06:00 
						 
				 
			
				
					
						
							
							
								amatellanes 
							
						 
					 
					
						
						
						
						
							
						
						
							0cb08ac707 
							
						 
					 
					
						
						
							
							Fixed Testing docs section  
						
						
						
					 
					
						2014-02-12 23:17:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							31dd160256 
							
						 
					 
					
						
						
							
							Typo  
						
						
						
					 
					
						2013-12-16 11:59:14 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c1be503308 
							
						 
					 
					
						
						
							
							Add notes to contributing docs  
						
						
						
					 
					
						2013-12-09 08:46:18 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e6f6bb5c7e 
							
						 
					 
					
						
						
							
							Add notes to contributing docs  
						
						
						
					 
					
						2013-12-09 08:42:09 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							23369650e3 
							
						 
					 
					
						
						
							
							Add notes to contributing docs  
						
						
						
					 
					
						2013-12-09 08:14:21 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e80b353085 
							
						 
					 
					
						
						
							
							Add notes to contributing docs  
						
						
						
					 
					
						2013-12-09 08:10:51 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							de5b9e39dd 
							
						 
					 
					
						
						
							
							First pass on contribution guide  
						
						
						
					 
					
						2013-12-04 14:59:09 +00:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							7a570e16e9 
							
						 
					 
					
						
						
							
							Fix md formatting and typos  
						
						
						
					 
					
						2013-05-28 17:13:12 +02:00 
						 
				 
			
				
					
						
							
							
								Pascal Borreli 
							
						 
					 
					
						
						
						
						
							
						
						
							8f35ac4f93 
							
						 
					 
					
						
						
							
							Fixed typos  
						
						
						
					 
					
						2013-05-28 15:09:23 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fb105d138c 
							
						 
					 
					
						
						
							
							Minor tweak  
						
						
						
					 
					
						2013-03-28 14:54:25 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							624ce250cd 
							
						 
					 
					
						
						
							
							Updating contribution docs (still wip)  
						
						
						
					 
					
						2013-03-22 22:06:38 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							061cffb67b 
							
						 
					 
					
						
						
							
							Added citation to contributing docs  
						
						
						
					 
					
						2012-09-27 12:49:08 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							215de9af81 
							
						 
					 
					
						
						
							
							Tidy up  
						
						
						
					 
					
						2012-09-07 10:17:47 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ef5279e97c 
							
						 
					 
					
						
						
							
							Improve docs  
						
						
						
					 
					
						2012-09-05 13:03:55 +01:00