Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							544b4b9948 
							
						 
					 
					
						
						
							
							Ensure 'markdown' dependancy is optional. Refs  #4941 . ( #4947 )  
						
						 
						
						
						
					 
					
						2017-03-09 16:50:00 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							52db57a6e7 
							
						 
					 
					
						
						
							
							Version 3.6 ( #4943 )  
						
						 
						
						
						
					 
					
						2017-03-09 14:49:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							68d2020112 
							
						 
					 
					
						
						
							
							Live API documentation ( #4755 )  
						
						 
						
						
						
					 
					
						2017-03-03 15:24:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mariusz Felisiak 
							
						 
					 
					
						
						
						
						
							
						
						
							3001b56e06 
							
						 
					 
					
						
						
							
							Fixed Django 2.0 compatibility due to django.conf.urls.include parameters change. ( #4866 )  
						
						 
						
						
						
					 
					
						2017-01-30 16:11:19 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mariusz Felisiak 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1c437a793c 
							
						 
					 
					
						
						
							
							Removed unnecessary importlib wrapper.  
						
						 
						
						
						
					 
					
						2017-01-29 20:38:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mariusz Felisiak 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0f9f147c 
							
						 
					 
					
						
						
							
							Removed unnecessary utc wrapper. ( #4839 )  
						
						 
						
						
						
					 
					
						2017-01-23 16:22:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							5717e853db 
							
						 
					 
					
						
						
							
							fix import of utc  
						
						 
						
						
						
					 
					
						2017-01-18 19:28:57 +06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							5436df54c6 
							
						 
					 
					
						
						
							
							added compat shim for utc/UTC  
						
						 
						
						
						
					 
					
						2017-01-18 19:06:41 +06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							30bf9df5d0 
							
						 
					 
					
						
						
							
							Fix guardian import ( #4612 )  
						
						 
						
						
						
					 
					
						2016-10-21 16:59:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukasz Karolewski 
							
						 
					 
					
						
						
						
						
							
						
						
							0b346e94b1 
							
						 
					 
					
						
						
							
							changing order of imports ( #4601 )  
						
						 
						
						... 
						
						
						
						when using with django-filter and rest_framework_swagger need to import coreapi before django-filter as django filter tries to load rest_framework.coreapi which is undefined at this point 
						
					 
					
						2016-10-21 15:00:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0dec36eb41 
							
						 
					 
					
						
						
							
							Version 3.5 ( #4525 )  
						
						 
						
						... 
						
						
						
						* Start test case
* Added 'requests' test client
* Address typos
* Graceful fallback if requests is not installed.
* Add cookie support
* Tests for auth and CSRF
* Py3 compat
* py3 compat
* py3 compat
* Add get_requests_client
* Added SchemaGenerator.should_include_link
* add settings for html cutoff on related fields
* Router doesn't work if prefix is blank, though project urls.py handles prefix
* Fix Django 1.10 to-many deprecation
* Add django.core.urlresolvers compatibility
* Update django-filter & django-guardian
* Check for empty router prefix; adjust URL accordingly
It's easiest to fix this issue after we have made the regex.  To try
to fix it before would require doing something different for List vs
Detail, which means we'd have to know which type of url we're
constructing before acting accordingly.
* Fix misc django deprecations
* Use TOC extension instead of header
* Fix deprecations for py3k
* Add py3k compatibility to is_simple_callable
* Add is_simple_callable tests
* Drop python 3.2 support (EOL, Dropped by Django)
* schema_renderers= should *set* the renderers, not append to them.
* API client (#4424 )
* Fix release notes
* Add note about 'User account is disabled.' vs 'Unable to log in'
* Clean up schema generation (#4527 )
* Handle multiple methods on custom action (#4529 )
* RequestsClient, CoreAPIClient
* exclude_from_schema
* Added 'get_schema_view()' shortcut
* Added schema descriptions
* Better descriptions for schemas
* Add type annotation to schema generation
* Coerce schema 'pk' in path to actual field name
* Deprecations move into assertion errors
* Use get_schema_view in tests
* Updte CoreJSON media type
* Handle schema structure correctly when path prefixs exist. Closes  #4401 
* Add PendingDeprecation to Router schema generation.
* Added SCHEMA_COERCE_PATH_PK and SCHEMA_COERCE_METHOD_NAMES
* Renamed and documented 'get_schema_fields' interface. 
						
					 
					
						2016-10-10 13:03:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dmitry Dygalo 
							
						 
					 
					
						
						
						
						
							
						
						
							e1768bdc16 
							
						 
					 
					
						
						
							
							Fixed various typos ( #4366 )  
						
						 
						
						
						
					 
					
						2016-08-08 09:32:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							11a2468379 
							
						 
					 
					
						
						
							
							Access request.user.is_authenticated as property not method, under Django 1.10+ ( #4358 )  
						
						 
						
						... 
						
						
						
						* For Django >=1.10 use user.is_authenticated, not user.is_authenticated() 
						
					 
					
						2016-08-05 11:04:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							061e0ed084 
							
						 
					 
					
						
						
							
							Added url and schema_url arguments ( #4321 )  
						
						 
						
						
						
					 
					
						2016-07-28 12:08:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aymeric Augustin 
							
						 
					 
					
						
						
						
						
							
						
						
							a436515196 
							
						 
					 
					
						
						
							
							Add missing return statement.  
						
						 
						
						... 
						
						
						
						Fix  #4272 . 
						
					 
					
						2016-07-16 22:44:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6ff9840bde 
							
						 
					 
					
						
						
							
							Schemas & client libraries. ( #4179 )  
						
						 
						
						... 
						
						
						
						* Added schema generation support.
* New tutorial section.
* API guide on schema generation.
* Topic guide on API clients. 
						
					 
					
						2016-07-04 16:38:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9c996d7d2a 
							
						 
					 
					
						
						
							
							Clean up existing deprecation warnings. ( #4166 )  
						
						 
						
						... 
						
						
						
						* Add Meta.fields = '__all__' to serializer classes where required.
* Add explicit on_delete=models.CASCADE to ForeignKey fields.
* Use '.remote_field' and '.model' in preference to '.rel' and '.to' when inspecting model fields.
* Use new value_from_object in preference to internal _get_val_from_obj 
						
					 
					
						2016-06-02 14:39:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							994e1ba927 
							
						 
					 
					
						
						
							
							Django 1.10 support. ( #4158 )  
						
						 
						
						... 
						
						
						
						* Added TEMPLATES setting to tests
* Remove deprecated view-string in URL conf
* Replace 'urls = ...' in test classes with override_settings('ROOT_URLCONF=...')
* Refactor UsingURLPatterns to use override_settings(ROOT_URLCONF=...) style
* Get model managers and names in a version-compatible manner.
* Apply override_settings to a TestCase, not a mixin class
* Use '.callback' property instead of private attributes when inspecting urlpatterns
* Pass 'user' to template explicitly
* Correct sorting of import statements.
* Remove unused TEMPLATE_LOADERS setting, in favor of TEMPLATES.
* Remove code style issue
* BaseFilter test requires a concrete model
* Resolve tox.ini issues
* Resolve isort differences between local and tox environments 
						
					 
					
						2016-06-01 15:31:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Karambir Singh Nain 
							
						 
					 
					
						
						
						
						
							
						
						
							69f1e3a9fd 
							
						 
					 
					
						
						
							
							Remove old django checks from tests and compat  
						
						 
						
						... 
						
						
						
						Remove skipping of tests for Django<1.8. Remove several functions from compat.py not needed for Django>=1.8 
						
					 
					
						2016-02-19 01:47:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Simon Charette 
							
						 
					 
					
						
						
						
						
							
						
						
							1a052d6ee3 
							
						 
					 
					
						
						
							
							Silenced deprecation warnings on Django 1.8.  
						
						 
						
						
						
					 
					
						2016-02-04 13:49:55 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							8ea7d6b5c6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into markdown-compat  
						
						 
						
						... 
						
						
						
						Conflicts:
	requirements/requirements-optionals.txt 
						
					 
					
						2016-01-19 15:34:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							d6c326623f 
							
						 
					 
					
						
						
							
							Make DRF compatible with multi template engine in Django 1.8  
						
						 
						
						
						
					 
					
						2015-11-25 07:37:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrei Fokau 
							
						 
					 
					
						
						
						
						
							
						
						
							2acc6a756c 
							
						 
					 
					
						
						
							
							Use related_objects api for Django 1.9+  
						
						 
						
						
						
					 
					
						2015-11-19 13:04:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrei Fokau 
							
						 
					 
					
						
						
						
						
							
						
						
							802ee5d0ea 
							
						 
					 
					
						
						
							
							Fix template.render deprecation warnings for 1.9+  
						
						 
						
						
						
					 
					
						2015-11-18 17:06:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael J. Schultz 
							
						 
					 
					
						
						
						
						
							
						
						
							abc6fa05e6 
							
						 
					 
					
						
						
							
							Markdown 2.1 compatible  
						
						 
						
						
						
					 
					
						2015-11-09 11:47:00 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael J. Schultz 
							
						 
					 
					
						
						
						
						
							
						
						
							b2e74fb523 
							
						 
					 
					
						
						
							
							Use markdown 2.6 extension_configs to configure extension  
						
						 
						
						
						
					 
					
						2015-11-05 10:52:31 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael J. Schultz 
							
						 
					 
					
						
						
						
						
							
						
						
							d9d34e4886 
							
						 
					 
					
						
						
							
							Use full python dot path to extension  
						
						 
						
						
						
					 
					
						2015-11-05 10:48:19 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael J. Schultz 
							
						 
					 
					
						
						
						
						
							
						
						
							276bc3bc2b 
							
						 
					 
					
						
						
							
							Remove safe_mode since it is not safe.  
						
						 
						
						
						
					 
					
						2015-11-05 10:47:56 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							41d1e42e9c 
							
						 
					 
					
						
						
							
							Add compat util for DecimalValidator  
						
						 
						
						
						
					 
					
						2015-10-29 06:42:16 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							34eb18b498 
							
						 
					 
					
						
						
							
							Merge branch 'master' into filters  
						
						 
						
						... 
						
						
						
						Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py 
						
					 
					
						2015-10-19 13:14:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dulmandakh 
							
						 
					 
					
						
						
						
						
							
						
						
							431ac45168 
							
						 
					 
					
						
						
							
							Update compat.py  
						
						 
						
						... 
						
						
						
						try to import guardian if it's in INSTALLED_APPS 
						
					 
					
						2015-10-09 11:03:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							10dbf1316f 
							
						 
					 
					
						
						
							
							Added JSONField.  Closes   #3170 .  
						
						 
						
						
						
					 
					
						2015-09-28 17:25:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							45ace5010e 
							
						 
					 
					
						
						
							
							Remove OrderedDict fallback  
						
						 
						
						
						
					 
					
						2015-09-22 16:35:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							0b34408172 
							
						 
					 
					
						
						
							
							Remove unittest.skipUnless  
						
						 
						
						
						
					 
					
						2015-09-22 16:24:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							6e86a53c92 
							
						 
					 
					
						
						
							
							Remove apps.get_model fallback  
						
						 
						
						... 
						
						
						
						* Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests` 
						
					 
					
						2015-09-22 16:14:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							68c88e180f 
							
						 
					 
					
						
						
							
							Remove ContentType import fallback  
						
						 
						
						
						
					 
					
						2015-09-22 15:55:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							8ea1606abf 
							
						 
					 
					
						
						
							
							Remove Django 1.5 clean_manytomany_helptext fallback  
						
						 
						
						
						
					 
					
						2015-09-21 20:16:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							25de8c960f 
							
						 
					 
					
						
						
							
							Remove Django 1.5 get_model_name fallback  
						
						 
						
						
						
					 
					
						2015-09-21 20:10:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							e625cff8a5 
							
						 
					 
					
						
						
							
							Remove Django 1.5 URLValidator fallback  
						
						 
						
						
						
					 
					
						2015-09-21 16:22:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							9216dc9a25 
							
						 
					 
					
						
						
							
							Remove Django 1.5 EmailValidator fallback  
						
						 
						
						
						
					 
					
						2015-09-21 16:20:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a3067bea55 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.3  
						
						 
						
						
						
					 
					
						2015-09-17 16:24:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							39ec564ae9 
							
						 
					 
					
						
						
							
							Do not access settings on compat import  
						
						 
						
						
						
					 
					
						2015-09-03 14:22:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							24a2c3f5c3 
							
						 
					 
					
						
						
							
							Resolve unittest compat  
						
						 
						
						
						
					 
					
						2015-08-28 10:19:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e70da5ac6b 
							
						 
					 
					
						
						
							
							Compat for GenericForeignKey, GenericRelation  
						
						 
						
						
						
					 
					
						2015-08-28 10:03:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4f27697467 
							
						 
					 
					
						
						
							
							Fix get_model import  
						
						 
						
						
						
					 
					
						2015-08-27 17:28:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							48540f180a 
							
						 
					 
					
						
						
							
							unittest compat fallback  
						
						 
						
						
						
					 
					
						2015-08-27 17:11:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							aeb57913c9 
							
						 
					 
					
						
						
							
							Filter HTML refinments  
						
						 
						
						
						
					 
					
						2015-08-27 14:25:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b4b2dc18fa 
							
						 
					 
					
						
						
							
							Clean-up refactoring of SearchFilter implementation  
						
						 
						
						
						
					 
					
						2015-08-20 11:35:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							4e5da16961 
							
						 
					 
					
						
						
							
							Remove Django 1.4 compat code  
						
						 
						
						
						
					 
					
						2015-08-07 00:02:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							877e964d7e 
							
						 
					 
					
						
						
							
							Don't need to support Django 1.4 with FilePathField.  
						
						 
						
						
						
					 
					
						2015-08-03 10:15:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8d7c0a8474 
							
						 
					 
					
						
						
							
							Merge branch 'feature/filepathfield' of  https://github.com/Ins1ne/django-rest-framework  into Ins1ne-feature/filepathfield  
						
						 
						
						
						
					 
					
						2015-08-03 10:09:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c8ad0cce19 
							
						 
					 
					
						
						
							
							Bump minimum Django version to 1.5  
						
						 
						
						
						
					 
					
						2015-07-30 15:43:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aider Ibragimov 
							
						 
					 
					
						
						
						
						
							
						
						
							a1397ac699 
							
						 
					 
					
						
						
							
							fix bugs, move version branching to compat, update ModelSerializer mapping  
						
						 
						
						
						
					 
					
						2015-07-19 00:26:03 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7351a3f6ca 
							
						 
					 
					
						
						
							
							Sort imports with isort  
						
						 
						
						
						
					 
					
						2015-06-25 16:55:51 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							83c9136c90 
							
						 
					 
					
						
						
							
							Cleanup import following PEP 8 style guide  
						
						 
						
						
						
					 
					
						2015-06-25 16:10:17 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Markus Korn 
							
						 
					 
					
						
						
						
						
							
						
						
							b42b16d0e6 
							
						 
					 
					
						
						
							
							compat: invert logic for checking the django version when implementing  
						
						 
						
						... 
						
						
						
						RequestFactory.generic() 
						
					 
					
						2015-06-22 16:13:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Markus Korn 
							
						 
					 
					
						
						
						
						
							
						
						
							06c61fc511 
							
						 
					 
					
						
						
							
							compat: only add compat implementation of RequestFactory.generic() if not  
						
						 
						
						... 
						
						
						
						provided by django 
						
					 
					
						2015-06-22 14:05:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hellysmile 
							
						 
					 
					
						
						
						
						
							
						
						
							c292b3d132 
							
						 
					 
					
						
						
							
							Fix set_rollback on @transaction.non_atomic_requests.  
						
						 
						
						
						
					 
					
						2015-06-08 07:10:57 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Delaby 
							
						 
					 
					
						
						
						
						
							
						
						
							c2d2417237 
							
						 
					 
					
						
						
							
							Tell default error handler to doom the transaction on error  
						
						 
						
						... 
						
						
						
						if `ATOMIC_REQUESTS` is enabled. 
						
					 
					
						2015-06-02 09:19:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Delaby 
							
						 
					 
					
						
						
						
						
							
						
						
							f701ecceb7 
							
						 
					 
					
						
						
							
							Add DurationField  
						
						 
						
						
						
					 
					
						2015-06-01 18:20:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petros Moisiadis 
							
						 
					 
					
						
						
						
						
							
						
						
							a13075486d 
							
						 
					 
					
						
						
							
							Compatibility code for getting user model  
						
						 
						
						... 
						
						
						
						Compatibility code for getting user model 
						
					 
					
						2015-05-19 17:57:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							c5eb5b2201 
							
						 
					 
					
						
						
							
							Move importlib fallback into compat.  
						
						 
						
						
						
					 
					
						2015-02-17 11:55:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee4b4f2dc 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2015-01-30 14:00:25 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							35f6a82462 
							
						 
					 
					
						
						
							
							Added DictField and support for HStoreField.  
						
						 
						
						
						
					 
					
						2015-01-23 16:27:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec08ce578 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2015-01-21 13:12:14 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							da6ef3d0b0 
							
						 
					 
					
						
						
							
							Allow missing fields option for inherited serializers.  Closes   #2388 .  
						
						 
						
						
						
					 
					
						2015-01-21 13:03:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6065cdbd93 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2015-01-19 15:16:57 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4f3c3a06cf 
							
						 
					 
					
						
						
							
							Drop trailing whitespace on indented JSON output.  Closes   #2429 .  
						
						 
						
						
						
					 
					
						2015-01-19 14:41:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabien Bochu 
							
						 
					 
					
						
						
						
						
							
						
						
							5484d570cb 
							
						 
					 
					
						
						
							
							Fix timedelta JSON serialization on Python 2.6.  
						
						 
						
						
						
					 
					
						2015-01-19 13:09:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b33a6cbff1 
							
						 
					 
					
						
						
							
							Ensure urlparse is not publically exposed in compat.py - less chance of accidental conflict.  
						
						 
						
						
						
					 
					
						2015-01-08 14:16:58 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ryan Gaffney 
							
						 
					 
					
						
						
						
						
							
						
						
							07ad0474c0 
							
						 
					 
					
						
						
							
							Fix compatibility comment regarding OrderedDict  
						
						 
						
						
						
					 
					
						2015-01-06 14:34:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6168f60ba8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into version-3.1  
						
						 
						
						
						
					 
					
						2015-01-05 11:02:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							efa5942ce1 
							
						 
					 
					
						
						
							
							Support namespaced router URLs with DefaultRouter.  
						
						 
						
						
						
					 
					
						2014-12-28 12:02:52 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fe9647ce92 
							
						 
					 
					
						
						
							
							AcceptHeaderVersioning to return unicode strings.  
						
						 
						
						
						
					 
					
						2014-12-16 16:37:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b6ee784240 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2014-12-15 12:18:55 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							72e08a3e8b 
							
						 
					 
					
						
						
							
							Use unicode internally everywhere for 'repr'  
						
						 
						
						
						
					 
					
						2014-12-15 11:55:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							baaa356489 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2014-12-12 15:37:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							001884a192 
							
						 
					 
					
						
						
							
							Removed unused compat code  
						
						 
						
						
						
					 
					
						2014-12-04 16:06:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							95af92ca01 
							
						 
					 
					
						
						
							
							Removed custom urlparse compat  
						
						 
						
						
						
					 
					
						2014-12-04 15:47:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							d54c67d79d 
							
						 
					 
					
						
						
							
							Removed custom StringIO, force_text, smart_text compat  
						
						 
						
						
						
					 
					
						2014-12-04 03:11:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tymur Maryokhin 
							
						 
					 
					
						
						
						
						
							
						
						
							09e59f2686 
							
						 
					 
					
						
						
							
							Removed custom python_2_unicode_compatible.  Closes   #2183  
						
						 
						
						
						
					 
					
						2014-12-04 02:50:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6620c72a 
							
						 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
					 
					
						2014-12-03 23:24:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6369f92125 
							
						 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
					 
					
						2014-12-03 23:12:52 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							7f9dc73672 
							
						 
					 
					
						
						
							
							Remove XML support from core  
						
						 
						
						
						
					 
					
						2014-11-29 14:57:51 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							731c8421af 
							
						 
					 
					
						
						
							
							Remove YAML support from core  
						
						 
						
						
						
					 
					
						2014-11-29 14:43:05 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc990792c 
							
						 
					 
					
						
						
							
							Merge branch 'version-3.1' into oauth_as_package  
						
						 
						
						... 
						
						
						
						Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini 
						
					 
					
						2014-11-28 12:14:40 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eleni Lixourioti 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa7783095 
							
						 
					 
					
						
						
							
							Merge branch 'version-3.1' of github.com:tomchristie/django-rest-framework into oauth_as_package  
						
						 
						
						... 
						
						
						
						Conflicts:
	.travis.yml 
						
					 
					
						2014-11-15 14:27:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4e001dbb7a 
							
						 
					 
					
						
						
							
							Drop usage of SortedDict.  Closes   #2027 .  
						
						 
						
						
						
					 
					
						2014-11-06 12:00:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cd40dcb065 
							
						 
					 
					
						
						
							
							Ensure json.dumps(separators=...) works on both 2.x and 3.x  
						
						 
						
						
						
					 
					
						2014-10-30 16:53:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5d247a65c8 
							
						 
					 
					
						
						
							
							First pass on nested serializers in HTML  
						
						 
						
						
						
					 
					
						2014-10-09 15:11:19 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							381771731f 
							
						 
					 
					
						
						
							
							Use six.text_type instead of str everywhere  
						
						 
						
						
						
					 
					
						2014-10-01 13:09:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dee3f78cb6 
							
						 
					 
					
						
						
							
							FileField and ImageField  
						
						 
						
						
						
					 
					
						2014-09-26 17:06:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f0a97595 
							
						 
					 
					
						
						
							
							More compat fixes  
						
						 
						
						
						
					 
					
						2014-09-22 16:45:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c54f394904 
							
						 
					 
					
						
						
							
							Ensure 'messages' in fields are respected in preference to default validator messages  
						
						 
						
						
						
					 
					
						2014-09-22 13:57:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							80ba047347 
							
						 
					 
					
						
						
							
							Compat fixes  
						
						 
						
						
						
					 
					
						2014-09-10 16:57:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							01c8c0cad9 
							
						 
					 
					
						
						
							
							Added help_text argument to fields  
						
						 
						
						
						
					 
					
						2014-09-10 13:52:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jharrod LaFon 
							
						 
					 
					
						
						
						
						
							
						
						
							baa518cd89 
							
						 
					 
					
						
						
							
							Moved OAuth support out of DRF and into a separate package, per  #1767  
						
						 
						
						
						
					 
					
						2014-09-05 15:30:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							63d02dbea8 
							
						 
					 
					
						
						
							
							Drop six from compat. 1.4.2 is now the lowest supported version.  
						
						 
						
						
						
					 
					
						2014-08-19 17:06:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e385a7b8eb 
							
						 
					 
					
						
						
							
							Merge master  
						
						 
						
						
						
					 
					
						2014-08-19 10:11:10 +01:00