Darren Maki 
							
						 
					 
					
						
						
						
						
							
						
						
							fe06d96dec 
							
						 
					 
					
						
						
							
							Fixing quotes in filtering.md  
						
						... 
						
						
						
						Incorrect quotes used in examples. 
						
					 
					
						2014-09-07 12:53:21 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4ae06b3b 
							
						 
					 
					
						
						
							
							Merge pull request  #1784  from tomchristie/remove-model-attribute  
						
						... 
						
						
						
						Deprecate `.model` attribute on views 
						
					 
					
						2014-08-29 10:03:07 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Hubbell 
							
						 
					 
					
						
						
						
						
							
						
						
							be21cafd2b 
							
						 
					 
					
						
						
							
							Update generic-views.md  
						
						... 
						
						
						
						Small grammar changes. 
						
					 
					
						2014-08-27 17:57:40 -07:00 
						 
				 
			
				
					
						
							
							
								Nathan Hubbell 
							
						 
					 
					
						
						
						
						
							
						
						
							19076510f4 
							
						 
					 
					
						
						
							
							Update generic-views.md  
						
						
						
					 
					
						2014-08-26 17:31:08 -07:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							c29c75da28 
							
						 
					 
					
						
						
							
							Merge pull request  #1789  from nemesisdesign/patch-5  
						
						... 
						
						
						
						docs: added drf-hstore to third party fields 
						
					 
					
						2014-08-26 11:19:48 +02:00 
						 
				 
			
				
					
						
							
							
								Federico Capoano 
							
						 
					 
					
						
						
						
						
							
						
						
							eb81c55d16 
							
						 
					 
					
						
						
							
							docs: added HStoreSerializer to third party serializers  
						
						... 
						
						
						
						added a reference to django-rest-framework-hstore in docs/api-guide/serializers.md 
						
					 
					
						2014-08-25 12:32:44 +02:00 
						 
				 
			
				
					
						
							
							
								Federico Capoano 
							
						 
					 
					
						
						
						
						
							
						
						
							8e3f7700f6 
							
						 
					 
					
						
						
							
							docs: added drf-hstore to third party fields  
						
						... 
						
						
						
						added a reference to django-rest-framework-hstore in docs/api-guide/fields.md 
						
					 
					
						2014-08-25 12:29:10 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8b2052172c 
							
						 
					 
					
						
						
							
							Add .model deprecation to release notes  
						
						
						
					 
					
						2014-08-21 12:25:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4d8c63abc9 
							
						 
					 
					
						
						
							
							Deprecate .model in related routers/permissions  
						
						
						
					 
					
						2014-08-20 17:15:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0c65e028b6 
							
						 
					 
					
						
						
							
							Release notes  
						
						
						
					 
					
						2014-08-19 23:25:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e385a7b8eb 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2014-08-19 10:11:10 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2aad8e4b35 
							
						 
					 
					
						
						
							
							Merge pull request  #1654  from carltongibson/1559-take-2  
						
						... 
						
						
						
						Allow use of native migrations in 1.7 — Take 2 
						
					 
					
						2014-08-18 18:54:43 +01:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							556948661a 
							
						 
					 
					
						
						
							
							Improve wording.  
						
						
						
					 
					
						2014-08-18 13:54:46 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							db4426fc35 
							
						 
					 
					
						
						
							
							Alter other reference to migrations.  
						
						
						
					 
					
						2014-08-18 13:52:57 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							ae2ab496c2 
							
						 
					 
					
						
						
							
							Updated docs for South v1.0  
						
						
						
					 
					
						2014-08-18 13:48:46 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8244c7cc33 
							
						 
					 
					
						
						
							
							Merge pull request  #1711  from kdazzle/ModelViewSet-queryset-static-property  
						
						... 
						
						
						
						Issue #1707 : Add documentation to api-docs.viewsets 
						
					 
					
						2014-08-18 12:25:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6edbabe0e1 
							
						 
					 
					
						
						
							
							Link to Django docs on widgets.  Closes   #1760 .  
						
						
						
					 
					
						2014-08-18 10:58:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c6326d0a67 
							
						 
					 
					
						
						
							
							Merge pull request  #1745  from nemesisdesign/patch-4  
						
						... 
						
						
						
						docs: add reference to gis serializer 
						
					 
					
						2014-08-09 07:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								Federico Capoano 
							
						 
					 
					
						
						
						
						
							
						
						
							c462a43a87 
							
						 
					 
					
						
						
							
							docs: added reference to gis serializer  
						
						... 
						
						
						
						added reference to GeoFeatureModelSerializer of django-rest-framework-gis 
						
					 
					
						2014-08-08 14:39:56 +02:00 
						 
				 
			
				
					
						
							
							
								Federico Capoano 
							
						 
					 
					
						
						
						
						
							
						
						
							5eb901cd2a 
							
						 
					 
					
						
						
							
							docs: added reference to DRF-gis in fields  
						
						... 
						
						
						
						added django-rest-framework-gis to third party packages section in /docs/api-guide/fields.md 
						
					 
					
						2014-08-08 14:25:02 +02:00 
						 
				 
			
				
					
						
							
							
								Rob Terhaar 
							
						 
					 
					
						
						
						
						
							
						
						
							3217842346 
							
						 
					 
					
						
						
							
							minor doc fix, @api_view() needs an iterable  
						
						
						
					 
					
						2014-08-06 18:55:08 -04:00 
						 
				 
			
				
					
						
							
							
								Kevin London 
							
						 
					 
					
						
						
						
						
							
						
						
							c0f002b09d 
							
						 
					 
					
						
						
							
							Updated Permissions doc link to Django docs  
						
						... 
						
						
						
						The previous link went to version 1 docs so it was a dead link. 
						
					 
					
						2014-07-31 12:41:15 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							57d6e04ff5 
							
						 
					 
					
						
						
							
							Add django-rest-framework-mongoengine link.  Closes   #1722   Closes   #1562   Closes   #1545  
						
						
						
					 
					
						2014-07-30 12:50:36 +01:00 
						 
				 
			
				
					
						
							
							
								Kyle 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8eb76c22 
							
						 
					 
					
						
						
							
							Issue  #1707  - Add info about queryset property caching to get_queryset() docs.  
						
						... 
						
						
						
						Add documentation to the get_queryset() method of generic-views.md regarding
the caching of the queryset property. 
						
					 
					
						2014-07-28 10:19:42 -07:00 
						 
				 
			
				
					
						
							
							
								Kyle 
							
						 
					 
					
						
						
						
						
							
						
						
							e40ffd60d4 
							
						 
					 
					
						
						
							
							Issue  #1707  - Add documentation about the caching of GenericAPIView.queryset  
						
						... 
						
						
						
						to the `queryset` property, `get_queryset()`, and do generic-views.md; remove
changes to the viewsets.md documentation from my last commit. 
						
					 
					
						2014-07-28 10:11:40 -07:00 
						 
				 
			
				
					
						
							
							
								Kyle Valade 
							
						 
					 
					
						
						
						
						
							
						
						
							48b02f016a 
							
						 
					 
					
						
						
							
							Issue  #1707 : Add documentation to api-docs.viewsets notifying users  
						
						... 
						
						
						
						that they should use the get_queryset() method when overriding a
ModelViewSet method, such as list(). Otherwise, since queryset is
a static property, the value will be cached for every instance of
that ViewSet. 
						
					 
					
						2014-07-27 14:01:43 -07:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							4876bec9f5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	rest_framework/fields.py 
						
					 
					
						2014-07-26 00:06:56 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							299a8347e8 
							
						 
					 
					
						
						
							
							Merge pull request  #1692  from davbo/patch-1  
						
						... 
						
						
						
						Update fields.md 
						
					 
					
						2014-07-22 15:59:04 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							81d15aa9be 
							
						 
					 
					
						
						
							
							Add link to drf-extra-fields.  Closes   #1698  
						
						
						
					 
					
						2014-07-20 15:45:45 +01:00 
						 
				 
			
				
					
						
							
							
								Dave King 
							
						 
					 
					
						
						
						
						
							
						
						
							680fabe9dd 
							
						 
					 
					
						
						
							
							Update fields.md  
						
						... 
						
						
						
						obj.__class__ will return the actual Class object, we want to serialise a string (accessed with obj.__class__.__name__) 
						
					 
					
						2014-07-17 11:46:59 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b519018125 
							
						 
					 
					
						
						
							
							Docs on object level permissions and filters.  Closes   #1683  
						
						
						
					 
					
						2014-07-07 09:51:23 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							91eabd54bb 
							
						 
					 
					
						
						
							
							Docs tweak  
						
						
						
					 
					
						2014-07-01 14:34:23 +01:00 
						 
				 
			
				
					
						
							
							
								Chibisov Gennady 
							
						 
					 
					
						
						
						
						
							
						
						
							c1426d1078 
							
						 
					 
					
						
						
							
							Fixes   #1651 . Add link to drf-extensions nested routers to docs  
						
						
						
					 
					
						2014-06-26 23:29:00 +04: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 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							2489e38a06 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	docs/api-guide/viewsets.md
	rest_framework/serializers.py
	rest_framework/throttling.py
	tests/test_generics.py
	tests/test_serializers.py
	tox.ini 
						
					 
					
						2014-06-23 14:02:45 +02:00 
						 
				 
			
				
					
						
							
							
								Greg Barker 
							
						 
					 
					
						
						
						
						
							
						
						
							be84f71bc9 
							
						 
					 
					
						
						
							
							Fix   #1614  - Corrected reference to serializers.CharField  
						
						
						
					 
					
						2014-06-10 15:20:45 -07:00 
						 
				 
			
				
					
						
							
							
								Rodolfo Carvalho 
							
						 
					 
					
						
						
						
						
							
						
						
							31f63e1e55 
							
						 
					 
					
						
						
							
							Fix typo in docs  
						
						
						
					 
					
						2014-06-02 11:06:03 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ff51118f 
							
						 
					 
					
						
						
							
							Note on configuring TokenAuthentication  
						
						
						
					 
					
						2014-05-29 14:33:16 +01:00 
						 
				 
			
				
					
						
							
							
								khamaileon 
							
						 
					 
					
						
						
						
						
							
						
						
							eab5933070 
							
						 
					 
					
						
						
							
							Add the allow_add_remove parameter to the get_serializer method  
						
						
						
					 
					
						2014-05-26 18:43:50 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							218b94e606 
							
						 
					 
					
						
						
							
							Merge pull request  #1536  from Ian-Foote/choicefield_blank_display_value  
						
						... 
						
						
						
						Allow customising ChoiceField blank display value 
						
					 
					
						2014-05-20 16:03:51 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							1e7b5fd2c0 
							
						 
					 
					
						
						
							
							Document ChoiceField blank_display_value parameter  
						
						
						
					 
					
						2014-05-20 14:55:00 +01:00 
						 
				 
			
				
					
						
							
							
								Giorgos Logiotatidis 
							
						 
					 
					
						
						
						
						
							
						
						
							768f537dcb 
							
						 
					 
					
						
						
							
							Typo fix.  
						
						
						
					 
					
						2014-05-15 15:42:22 +03:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							56b4390316 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 2.4.0  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	rest_framework/serializers.py
	rest_framework/tests/test_authentication.py 
						
					 
					
						2014-04-30 22:21:26 +02:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							d8fb81ceb1 
							
						 
					 
					
						
						
							
							Merge pull request  #1391  from kaygorodov/master  
						
						... 
						
						
						
						Turning off pagination 
						
					 
					
						2014-04-30 20:14:16 +02:00 
						 
				 
			
				
					
						
							
							
								Laurent Bristiel 
							
						 
					 
					
						
						
						
						
							
						
						
							d8cb85ef8f 
							
						 
					 
					
						
						
							
							typo  
						
						
						
					 
					
						2014-04-28 22:00:36 +02:00 
						 
				 
			
				
					
						
							
							
								dpetzel 
							
						 
					 
					
						
						
						
						
							
						
						
							5e8f05a8de 
							
						 
					 
					
						
						
							
							very minor typo in code example  
						
						
						
					 
					
						2014-04-28 13:51:50 -04: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 
						 
				 
			
				
					
						
							
							
								Miro Hrončok 
							
						 
					 
					
						
						
						
						
							
						
						
							f68596a732 
							
						 
					 
					
						
						
							
							Document new UnicodeYAMLRenderer  
						
						
						
					 
					
						2014-04-10 01:58:06 +02:00 
						 
				 
			
				
					
						
							
							
								Craig 
							
						 
					 
					
						
						
						
						
							
						
						
							3234a5dd6b 
							
						 
					 
					
						
						
							
							Fix python syntax in filtering docs  
						
						
						
					 
					
						2014-04-08 22:56:07 -04:00