Mads Jensen
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4cdb21de9
							
						
					 | 
					
						
						
							
							Fixes #3786
						
						
						
						
						
						
						
						Minor fix for dictionary key lookup in settings file 
						
					 | 
					
						2016-01-06 22:51:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c389aeb051
							
						
					 | 
					
						
						
							
							Lint import ordring
						
						
						
						
						
					 | 
					
						2015-12-16 18:46:23 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							62e2a9706f
							
						
					 | 
					
						
						
							
							Fixed import order settings
						
						
						
						
						
					 | 
					
						2015-12-16 18:37:50 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							dab6bf4b1a
							
						
					 | 
					
						
						
							
							Changed error to warning message
						
						
						
						
						
					 | 
					
						2015-12-16 18:35:02 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbd89d6b7e
							
						
					 | 
					
						
						
							
							Moved SETTINGS_DOC
						
						
						
						
						
					 | 
					
						2015-12-12 02:02:53 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a615e37277
							
						
					 | 
					
						
						
							
							Removed depreceated constant
						
						
						
						
						
					 | 
					
						2015-12-07 23:30:45 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							5802dc0f98
							
						
					 | 
					
						
						
							
							Initial, fixes #3644
						
						
						
						
						
					 | 
					
						2015-12-07 23:25:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f85165b69
							
						
					 | 
					
						
						
							
							Fixed num args for %
						
						
						
						
						
					 | 
					
						2015-12-07 22:36:02 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							5117dad2ca
							
						
					 | 
					
						
						
							
							removed setting typo
						
						
						
						
						
					 | 
					
						2015-12-07 22:32:23 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							13c66b9dfe
							
						
					 | 
					
						
						
							
							Return error
						
						
						
						
						
					 | 
					
						2015-12-07 21:53:33 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luis San Pablo
							
						 
					 | 
					
						
						
						
						
							
						
						
							d86a901aff
							
						
					 | 
					
						
						
							
							Removed Settings raise attribute error
						
						
						
						
						
					 | 
					
						2015-12-07 21:45:44 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf33008571
							
						
					 | 
					
						
						
							
							Release notes etc
						
						
						
						
						
					 | 
					
						2015-10-22 14:05:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c64896c849
							
						
					 | 
					
						
						
							
							More cleanup of browser overrides
						
						
						
						
						
					 | 
					
						2015-09-28 15:33:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7142e23ac
							
						
					 | 
					
						
						
							
							Merge branch 'master' into remove-content-overriding
						
						
						
						
						
					 | 
					
						2015-09-28 15:15:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							566812ac0b
							
						
					 | 
					
						
						
							
							Remove method and content overriding
						
						
						
						
						
					 | 
					
						2015-09-17 15:17:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b7ebb9d2c
							
						
					 | 
					
						
						
							
							Fixed import sorting
						
						
						
						
						
					 | 
					
						2015-09-03 16:29:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							10da18b20b
							
						
					 | 
					
						
						
							
							Access settings lazily, not at module import
						
						
						
						
						
					 | 
					
						2015-09-03 16:24:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb4233736f
							
						
					 | 
					
						
						
							
							Empty settings should also be coerced to lists. Closes #3087.
						
						
						
						
						
					 | 
					
						2015-07-02 10:28:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Laszlo Marai
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0bced6413
							
						
					 | 
					
						
						
							
							Handle AttributeError as well (when the imported module exists but
						
						
						
						
						
						
						
						the specified function/class does not). 
						
					 | 
					
						2015-06-30 05:49:44 +02: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							18cc0230bf
							
						
					 | 
					
						
						
							
							Clean up pagination attributes
						
						
						
						
						
					 | 
					
						2015-03-04 15:51:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlton Gibson
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5eb5b2201
							
						
					 | 
					
						
						
							
							Move importlib fallback into compat.
						
						
						
						
						
					 | 
					
						2015-02-17 11:55:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlton Gibson
							
						 
					 | 
					
						
						
						
						
							
						
						
							daf1d59d0f
							
						
					 | 
					
						
						
							
							Adjust importlib import
						
						
						
						
						
					 | 
					
						2015-02-17 11:22:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ee4b4f2dc
							
						
					 | 
					
						
						
							
							Merge master
						
						
						
						
						
					 | 
					
						2015-01-30 14:00:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							65bca59ea5
							
						
					 | 
					
						
						
							
							Reload api_settings when using Django's 'override_settings'
						
						
						
						
						
					 | 
					
						2015-01-27 13:51:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							6065cdbd93
							
						
					 | 
					
						
						
							
							Merge master
						
						
						
						
						
					 | 
					
						2015-01-19 15:16:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							73feaf6299
							
						
					 | 
					
						
						
							
							First pass at 3.1 pagination API
						
						
						
						
						
					 | 
					
						2015-01-09 15:30:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d9e7a5356
							
						
					 | 
					
						
						
							
							Ammend docstring to use python2/3 compatible example.
						
						
						
						
						
					 | 
					
						2015-01-08 15:38:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							05a6eaec8a
							
						
					 | 
					
						
						
							
							More docs, plus 'ALLOWED_VERSIONS' setting.
						
						
						
						
						
					 | 
					
						2014-12-17 12:41:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cfa0e0306
							
						
					 | 
					
						
						
							
							Merge lateset version-3.1
						
						
						
						
						
					 | 
					
						2014-12-16 15:35:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							74483338ab
							
						
					 | 
					
						
						
							
							Merge branch 'master' into version-3.1
						
						
						
						
						
					 | 
					
						2014-12-16 15:34:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e51e4f5cd
							
						
					 | 
					
						
						
							
							Versioning first pass
						
						
						
						
						
					 | 
					
						2014-12-16 15:34:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							a15db353bf
							
						
					 | 
					
						
						
							
							Minor test cleanup
						
						
						
						
						
					 | 
					
						2014-12-15 13:18:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							baaa356489
							
						
					 | 
					
						
						
							
							Merge master
						
						
						
						
						
					 | 
					
						2014-12-12 15:37:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tymur Maryokhin
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9930181ee
							
						
					 | 
					
						
						
							
							Removed unused imports, pep8 fixes, typo fixes
						
						
						
						
						
					 | 
					
						2014-12-05 00:29:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								José Padilla
							
						 
					 | 
					
						
						
						
						
							
						
						
							731c8421af
							
						
					 | 
					
						
						
							
							Remove YAML support from core
						
						
						
						
						
					 | 
					
						2014-11-29 14:43:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							dee3f78cb6
							
						
					 | 
					
						
						
							
							FileField and ImageField
						
						
						
						
						
					 | 
					
						2014-09-26 17:06:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4b1dcb167
							
						
					 | 
					
						
						
							
							OPTIONS support
						
						
						
						
						
					 | 
					
						2014-09-24 14:09:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							79715f01f8
							
						
					 | 
					
						
						
							
							Coerce dates etc to ISO_8601 in seralizer, by default.
						
						
						
						
						
					 | 
					
						2014-09-12 12:10:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e39e159ee
							
						
					 | 
					
						
						
							
							UNICODE_JSON and COMPACT_JSON settings
						
						
						
						
						
					 | 
					
						2014-09-12 11:38:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							6db3356c4d
							
						
					 | 
					
						
						
							
							NON_FIELD_ERRORS_KEY setting
						
						
						
						
						
					 | 
					
						2014-09-12 10:21:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f62c874ea9
							
						
					 | 
					
						
						
							
							Remove filter_backend.
						
						
						
						
						
						
						
						Closes #1775. 
						
					 | 
					
						2014-08-29 10:48:40 +01: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf09c32de8
							
						
					 | 
					
						
						
							
							Code linting and added runtests.py
						
						
						
						
						
					 | 
					
						2014-08-19 13:28:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlton Gibson
							
						 
					 | 
					
						
						
						
						
							
						
						
							d98245ac22
							
						
					 | 
					
						
						
							
							Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559
						
						
						
						
						
						
						
						Conflicts:
	docs/topics/release-notes.md 
						
					 | 
					
						2014-06-24 10:30:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlton Gibson
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f727ce738
							
						
					 | 
					
						
						
							
							Added (first pass) notes to docs & release notes. Backed out SOUTH_MIGRATION_MODULES setting from rest_framework.settings
						
						
						
						
						
					 | 
					
						2014-06-24 09:02:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carlton Gibson
							
						 
					 | 
					
						
						
						
						
							
						
						
							f34011f801
							
						
					 | 
					
						
						
							
							Allow use of native migrations in 1.7
						
						
						
						
						
					 | 
					
						2014-06-23 14:52:18 +02: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 | 
					
					
						
						
							
							
							
						
					 |