Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							05a6eaec8a
							
						
					 | 
					
						
						
							
							More docs, plus 'ALLOWED_VERSIONS' setting.
						
						
						
						
						
					 | 
					
						2014-12-17 12:41:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d232c5739e
							
						
					 | 
					
						
						
							
							Merge branch 'exception-handler-context' of git://github.com/jpadilla/django-rest-framework into version-3.1
						
						
						
						
						
					 | 
					
						2014-12-15 09:19:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								José Padilla
							
						 
					 | 
					
						
						
						
						
							
						
						
							478c8d724b
							
						
					 | 
					
						
						
							
							Update docs
						
						
						
						
						
					 | 
					
						2014-12-14 10:16:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								José Padilla
							
						 
					 | 
					
						
						
						
						
							
						
						
							731c8421af
							
						
					 | 
					
						
						
							
							Remove YAML support from core
						
						
						
						
						
					 | 
					
						2014-11-29 14:43:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f13c0ebe69
							
						
					 | 
					
						
						
							
							Merge master
						
						
						
						
						
					 | 
					
						2014-11-25 16:27:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								José Padilla
							
						 
					 | 
					
						
						
						
						
							
						
						
							16d442dda3
							
						
					 | 
					
						
						
							
							Use MkDocs meta.source to render source code links
						
						
						
						
						
					 | 
					
						2014-11-25 12:44:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e726e22a3
							
						
					 | 
					
						
						
							
							request.DATA, request.FILES -> request.data
						
						
						
						
						
					 | 
					
						2014-11-25 11:42:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Dapena-Tretter
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e940a22fb
							
						
					 | 
					
						
						
							
							Clarify how permission classes are composed
						
						
						
						
						
						
						
						all/every/AND or any/OR? all/every/AND! 
						
					 | 
					
						2014-11-21 16:04:45 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brett Koonce
							
						 
					 | 
					
						
						
						
						
							
						
						
							b44def4650
							
						
					 | 
					
						
						
							
							minor spelling tweaks
						
						
						
						
						
					 | 
					
						2014-11-06 23:19:26 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							21d06a4103
							
						
					 | 
					
						
						
							
							Added NON_FIELD_ERRORS_KEY to serializer docs. Closes #1971.
						
						
						
						
						
					 | 
					
						2014-11-03 15:03:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f95e7fae38
							
						
					 | 
					
						
						
							
							Updating docs
						
						
						
						
						
					 | 
					
						2014-09-12 12:40:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b2052172c
							
						
					 | 
					
						
						
							
							Add .model deprecation to release notes
						
						
						
						
						
					 | 
					
						2014-08-21 12:25:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Xavier Ordoquy
							
						 
					 | 
					
						
						
						
						
							
						
						
							d08536ad9d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0
						
						
						
						
						
						
						
						Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini 
						
					 | 
					
						2014-04-13 00:05:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Peter Inglesby
							
						 
					 | 
					
						
						
						
						
							
						
						
							2353878951
							
						
					 | 
					
						
						
							
							Add SEARCH_PARAM and ORDERING_PARAM to settings
						
						
						
						
						
						
						
						Fixes #1434 
						
					 | 
					
						2014-03-06 21:39:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d20c49da4a
							
						
					 | 
					
						
						
							
							More HyperlinkedModelSerializer docs
						
						
						
						
						
					 | 
					
						2014-01-14 20:34:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							83da4949c0
							
						
					 | 
					
						
						
							
							Allow NUM_PROXIES=0 and include more docs
						
						
						
						
						
					 | 
					
						2013-12-13 00:02:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andy Freeland
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5523bcc7d
							
						
					 | 
					
						
						
							
							Support customizable view EXCEPTION_HANDLER
						
						
						
						
						
						
						
						Add `api_settings.EXCEPTION_HANDLER` to support custom error responses.
Fixes #907. 
						
					 | 
					
						2013-09-06 12:47:33 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							848567a0cd
							
						
					 | 
					
						
						
							
							Docs for MAX_PAGINATE_BY setting & view attribute.
						
						
						
						
						
					 | 
					
						2013-08-28 12:55:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							5120670624
							
						
					 | 
					
						
						
							
							Document customizable view names/descriptions
						
						
						
						
						
					 | 
					
						2013-08-19 08:45:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Veronica Lynn
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d8d2340be
							
						
					 | 
					
						
						
							
							Fixed typos in a bunch of docs
						
						
						
						
						
					 | 
					
						2013-08-07 14:00:06 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a722de171
							
						
					 | 
					
						
						
							
							Complete testing docs
						
						
						
						
						
					 | 
					
						2013-07-01 13:59:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Toby Champion
							
						 
					 | 
					
						
						
						
						
							
						
						
							250dfef158
							
						
					 | 
					
						
						
							
							Changes 'python' to 'Python' when used in prose.
						
						
						
						
						
					 | 
					
						2013-06-12 14:51:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pascal Borreli
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f35ac4f93
							
						
					 | 
					
						
						
							
							Fixed typos
						
						
						
						
						
					 | 
					
						2013-05-28 15:09:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b443560080
							
						
					 | 
					
						
						
							
							Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings.  Closes #798
						
						
						
						
						
					 | 
					
						2013-05-08 20:38:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c2bb06660
							
						
					 | 
					
						
						
							
							Support for multiple filter classes
						
						
						
						
						
					 | 
					
						2013-05-07 13:00:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8adde506e8
							
						
					 | 
					
						
						
							
							Default date/time fields now return python date/time objects again by default
						
						
						
						
						
					 | 
					
						2013-03-21 08:41:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							1106596c80
							
						
					 | 
					
						
						
							
							Clean ups to datetime formatting
						
						
						
						
						
					 | 
					
						2013-03-06 12:19:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f7b028a0a
							
						
					 | 
					
						
						
							
							Updating docs
						
						
						
						
						
					 | 
					
						2013-03-05 20:57:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a2788a7be
							
						
					 | 
					
						
						
							
							Update docs
						
						
						
						
						
					 | 
					
						2013-03-01 16:50:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9d36d4726
							
						
					 | 
					
						
						
							
							Add docs update - part 1
						
						
						
						
						
					 | 
					
						2013-03-01 16:50:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							5432f9ba49
							
						
					 | 
					
						
						
							
							Fill in missing and incorrect settings.
						
						
						
						
						
					 | 
					
						2013-02-23 17:12:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Tamlyn
							
						 
					 | 
					
						
						
						
						
							
						
						
							4df1172665
							
						
					 | 
					
						
						
							
							Fix reference to BasicAuthentication in settings.
						
						
						
						
						
					 | 
					
						2013-01-08 11:45:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							e429f702e0
							
						
					 | 
					
						
						
							
							Fix PAGINATE_BY_PARAM docs.  Refs #551
						
						
						
						
						
					 | 
					
						2013-01-07 20:17:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							31f01bd631
							
						
					 | 
					
						
						
							
							Polishing to page size query parameters & more docs
						
						
						
						
						
					 | 
					
						2012-11-16 22:45:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ae203a018
							
						
					 | 
					
						
						
							
							updated script to just use page_size_kwarg
						
						
						
						
						
					 | 
					
						2012-11-15 12:06:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							38e94bb8b4
							
						
					 | 
					
						
						
							
							added global and per resource on/off switch + updated docs
						
						
						
						
						
					 | 
					
						2012-11-15 11:15:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f7f0b6ffb
							
						
					 | 
					
						
						
							
							added missing semicolon
						
						
						
						
						
					 | 
					
						2012-10-31 10:41:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephan Groß
							
						 
					 | 
					
						
						
						
						
							
						
						
							72f3a7e4a7
							
						
					 | 
					
						
						
							
							add missing semicolon
						
						
						
						
						
					 | 
					
						2012-10-29 09:13:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d995742afc
							
						
					 | 
					
						
						
							
							Add AllowAny permission
						
						
						
						
						
					 | 
					
						2012-10-27 20:04:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							fed235dd01
							
						
					 | 
					
						
						
							
							Make settings consistent with corrosponding view attributes
						
						
						
						
						
					 | 
					
						2012-10-17 23:09:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							cab4a2a5ad
							
						
					 | 
					
						
						
							
							Split up doc sections more cleanly
						
						
						
						
						
					 | 
					
						2012-10-17 15:41:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							97a7f27c82
							
						
					 | 
					
						
						
							
							Rename HTMLTemplateRenderer -> HTMLRenderer, DocuemntingHTMLRenderer -> BrowseableAPIRenderer
						
						
						
						
						
					 | 
					
						2012-10-09 15:58:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7685f3eb5
							
						
					 | 
					
						
						
							
							URL overrides in settings fixed up slightly
						
						
						
						
						
					 | 
					
						2012-10-02 15:24:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b691c4027
							
						
					 | 
					
						
						
							
							Change package name: djangorestframework -> rest_framework
						
						
						
						
						
					 | 
					
						2012-09-20 13:06:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c85f799ade
							
						
					 | 
					
						
						
							
							Updating docs
						
						
						
						
						
					 | 
					
						2012-09-12 10:12:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							247696e820
							
						
					 | 
					
						
						
							
							Links to source files in docs
						
						
						
						
						
					 | 
					
						2012-09-08 22:06:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c648f2786f
							
						
					 | 
					
						
						
							
							TODO notes in docs
						
						
						
						
						
					 | 
					
						2012-09-06 16:46:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c707034649
							
						
					 | 
					
						
						
							
							Add more settings to settings.py
						
						
						
						
						
					 | 
					
						2012-09-06 15:57:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							224b538b31
							
						
					 | 
					
						
						
							
							Tidying up docs
						
						
						
						
						
					 | 
					
						2012-09-05 21:14:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a106aed79
							
						
					 | 
					
						
						
							
							Flesh out authentication docs
						
						
						
						
						
					 | 
					
						2012-09-05 20:10:06 +01:00 | 
					
					
						
						
							
							
							
						
					 |