Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a99a449c88 
							
						 
					 
					
						
						
							
							Add test for PUT with session auth+csrf  
						
						
						
					 
					
						2012-01-21 17:47:33 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							7a87fc87c2 
							
						 
					 
					
						
						
							
							Merge pull request  #138  from mjumbewu/feature/admin_static_files  
						
						... 
						
						
						
						Support both staticfiles and ADMIN_MEDIA_PREFIX styles. 
						
					 
					
						2012-01-21 02:39:02 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							bf8fe66f44 
							
						 
					 
					
						
						
							
							Fix .delete on object store example.  
						
						
						
					 
					
						2012-01-21 10:07:33 +00:00 
						 
				 
			
				
					
						
							
							
								Mjumbe Wawatu Poe 
							
						 
					 
					
						
						
						
						
							
						
						
							417eacb2ed 
							
						 
					 
					
						
						
							
							Add a get_object method to the ModelMixin, and tests  
						
						
						
					 
					
						2012-01-20 13:05:44 -05:00 
						 
				 
			
				
					
						
							
							
								Mjumbe Wawatu Poe 
							
						 
					 
					
						
						
						
						
							
						
						
							26c1558e0f 
							
						 
					 
					
						
						
							
							Update the admin static files to handle the latest version of admin  
						
						
						
					 
					
						2012-01-20 10:53:30 -05:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a8ed7f9189 
							
						 
					 
					
						
						
							
							Merge pull request  #130  from flashingpumpkin/master  
						
						... 
						
						
						
						Added an additional attribute `unknown_form_fields` to `FormResource` 
						
					 
					
						2012-01-19 10:55:31 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							868f7bd7dc 
							
						 
					 
					
						
						
							
							Added @bunchesofdonald.  Thanks!  
						
						
						
					 
					
						2012-01-19 18:54:18 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dafda87a5c 
							
						 
					 
					
						
						
							
							Merge pull request  #135  from bunchesofdonald/master  
						
						... 
						
						
						
						Add get_queryset method to ListModelMixin. 
						
					 
					
						2012-01-19 10:53:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alen Mujezinovic 
							
						 
					 
					
						
						
						
						
							
						
						
							4e52ce4d33 
							
						 
					 
					
						
						
							
							Turns out it was self.fields  
						
						
						
					 
					
						2012-01-19 18:45:19 +00:00 
						 
				 
			
				
					
						
							
							
								Chris Pickett 
							
						 
					 
					
						
						
						
						
							
						
						
							338e77837c 
							
						 
					 
					
						
						
							
							Added get_queryset method to ListModelMixin.  
						
						... 
						
						
						
						This can be easily re-implemented in a view, to allow the user to take
such things as request.user into account when creating the queryset. 
						
					 
					
						2012-01-19 12:56:09 -05:00 
						 
				 
			
				
					
						
							
							
								Alen Mujezinovic 
							
						 
					 
					
						
						
						
						
							
						
						
							ec5badf739 
							
						 
					 
					
						
						
							
							Renamed unknown_form_fields to allow_unknown_form_fields  
						
						
						
					 
					
						2012-01-19 15:52:26 +00:00 
						 
				 
			
				
					
						
							
							
								Ben Timby 
							
						 
					 
					
						
						
						
						
							
						
						
							0a5ca000ed 
							
						 
					 
					
						
						
							
							Docstring/whitespace fixes.  
						
						
						
					 
					
						2012-01-18 22:59:30 -05:00 
						 
				 
			
				
					
						
							
							
								Alen Mujezinovic 
							
						 
					 
					
						
						
						
						
							
						
						
							167dce008c 
							
						 
					 
					
						
						
							
							Documentation error.  
						
						
						
					 
					
						2012-01-17 11:08:44 +00:00 
						 
				 
			
				
					
						
							
							
								Alen Mujezinovic 
							
						 
					 
					
						
						
						
						
							
						
						
							0a167a54fd 
							
						 
					 
					
						
						
							
							Added an additional attribute unknown_form_fields to FormResource  
						
						... 
						
						
						
						If the attribute is set to `True`, the validation method will not
raise an `ErrorResponse` with status 400 but silently strip out
unexpected fields on the form and only return the validated data. 
						
					 
					
						2012-01-17 11:01:32 +00:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							5f4096ca28 
							
						 
					 
					
						
						
							
							py25, py26 along with Django12 can't handle assertDictEqual (it was introduced  
						
						... 
						
						
						
						in py27) 
						
					 
					
						2012-01-13 23:01:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							905dd2ed9d 
							
						 
					 
					
						
						
							
							Got rid of more duplicate tests and put back the tests for  #122 .  
						
						
						
					 
					
						2012-01-13 21:57:49 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							c204101563 
							
						 
					 
					
						
						
							
							Merge pull request  #125  from michelelazzeri-nextage/master  
						
						... 
						
						
						
						application/xml parser fully compatible with application/xml render 
						
					 
					
						2012-01-13 12:36:02 -08:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							21776c0de2 
							
						 
					 
					
						
						
							
							split renderer and parser complex data test case  
						
						
						
					 
					
						2012-01-13 10:11:34 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							1bec6f2d5e 
							
						 
					 
					
						
						
							
							add testcate XMLRendererTestCase.test_render_and_parse_complex_data  
						
						
						
					 
					
						2012-01-12 18:04:18 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							2966c34352 
							
						 
					 
					
						
						
							
							correct complex data xml parsing  
						
						
						
					 
					
						2012-01-12 13:28:32 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							6b3792aef2 
							
						 
					 
					
						
						
							
							recursive xml parsing  
						
						
						
					 
					
						2012-01-11 19:37:43 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							1664bc7b91 
							
						 
					 
					
						
						
							
							recursive xml parsing  
						
						
						
					 
					
						2012-01-11 19:36:43 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							27d22cff6c 
							
						 
					 
					
						
						
							
							Revert "update author"  
						
						... 
						
						
						
						This reverts commit f461acbaf2 
						
					 
					
						2012-01-11 19:34:08 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							ab83a2faae 
							
						 
					 
					
						
						
							
							recursive xml parsing  
						
						
						
					 
					
						2012-01-11 19:31:08 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							ad7d921e86 
							
						 
					 
					
						
						
							
							Revert "update author"  
						
						... 
						
						
						
						This reverts commit f461acbaf2 
						
					 
					
						2012-01-11 19:29:48 +01:00 
						 
				 
			
				
					
						
							
							
								Michele Lazzeri 
							
						 
					 
					
						
						
						
						
							
						
						
							f461acbaf2 
							
						 
					 
					
						
						
							
							update author  
						
						
						
					 
					
						2012-01-11 18:58:43 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c71b6fb090 
							
						 
					 
					
						
						
							
							Replace 'x.has_key(y)' with 'y in x'  
						
						
						
					 
					
						2012-01-11 16:43:04 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8b296e75 
							
						 
					 
					
						
						
							
							Added test_ugettext_lazy test. Refs  #87 .  
						
						
						
					 
					
						2012-01-11 16:16:22 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c995ab397c 
							
						 
					 
					
						
						
							
							Made suggested cleanups. Refs  #121 .  
						
						
						
					 
					
						2012-01-11 14:56:12 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ddbf435c 
							
						 
					 
					
						
						
							
							Merge pull request  #121  from sebpiq/issue-73  
						
						... 
						
						
						
						Fixes  #73 .
Thanks @sebpiq, @ekohl! 
					
						2012-01-11 06:53:32 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							840845e9ef 
							
						 
					 
					
						
						
							
							Added @dzen.  Thanks!  
						
						
						
					 
					
						2012-01-11 14:49:32 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							42563d9fbc 
							
						 
					 
					
						
						
							
							Remove explicit handling of 'OPTIONS' method, just raise the response, rather than returning it.  
						
						
						
					 
					
						2012-01-11 14:48:22 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ac51210594 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tomchristie/django-rest-framework  
						
						
						
					 
					
						2012-01-11 14:42:21 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4c438f9f4d 
							
						 
					 
					
						
						
							
							Some minor tidy up  
						
						
						
					 
					
						2012-01-11 14:42:16 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b522cc8e51 
							
						 
					 
					
						
						
							
							Merge  https://github.com/dzen/django-rest-framework  
						
						
						
					 
					
						2012-01-11 14:37:25 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2d3c32d322 
							
						 
					 
					
						
						
							
							Added @sebzur - Thanks!  
						
						
						
					 
					
						2012-01-11 14:09:31 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0cfe2acdef 
							
						 
					 
					
						
						
							
							Minor cleanup on ModelMixin  
						
						
						
					 
					
						2012-01-11 14:07:33 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dacc9c0ff7 
							
						 
					 
					
						
						
							
							Merge  https://github.com/sebzur/django-rest-framework  
						
						
						
					 
					
						2012-01-11 13:54:44 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							97c5262e9c 
							
						 
					 
					
						
						
							
							Refactor add_query_param to use URLObject.  Refs  #112 .  
						
						
						
					 
					
						2012-01-11 13:50:43 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c8134a6340 
							
						 
					 
					
						
						
							
							Replace tab with spaces.  
						
						
						
					 
					
						2012-01-11 13:44:11 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b1105edfed 
							
						 
					 
					
						
						
							
							Use safe_dump.   Fixes   #123 .  
						
						
						
					 
					
						2012-01-11 13:43:47 +00:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa14a3e17 
							
						 
					 
					
						
						
							
							fixes   #122  
						
						... 
						
						
						
						tahanks @remcogerlich 
						
					 
					
						2012-01-11 10:27:14 +01:00 
						 
				 
			
				
					
						
							
							
								Sebastian Żurek 
							
						 
					 
					
						
						
						
						
							
						
						
							86b1495cad 
							
						 
					 
					
						
						
							
							QueryMixin to ModelMixin rename.  
						
						
						
					 
					
						2012-01-10 21:42:50 +01:00 
						 
				 
			
				
					
						
							
							
								Sébastien Piquemal 
							
						 
					 
					
						
						
						
						
							
						
						
							792bc4d608 
							
						 
					 
					
						
						
							
							fixed issue#73 and added a test  
						
						
						
					 
					
						2012-01-10 20:38:01 +02:00 
						 
				 
			
				
					
						
							
							
								Benoit C 
							
						 
					 
					
						
						
						
						
							
						
						
							35ba2fc65b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/dzen/django-rest-framework  
						
						... 
						
						
						
						Conflicts:
	djangorestframework/views.py 
						
					 
					
						2012-01-10 00:25:33 +01:00 
						 
				 
			
				
					
						
							
							
								Benoit C 
							
						 
					 
					
						
						
						
						
							
						
						
							96e91f5841 
							
						 
					 
					
						
						
							
							Add test for final() method  
						
						
						
					 
					
						2012-01-10 00:23:19 +01:00 
						 
				 
			
				
					
						
							
							
								Benoit C 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab67e789e 
							
						 
					 
					
						
						
							
							Introduce a final methods in View class  
						
						
						
					 
					
						2012-01-10 00:04:10 +01:00 
						 
				 
			
				
					
						
							
							
								Benoit C 
							
						 
					 
					
						
						
						
						
							
						
						
							94f24e2e2f 
							
						 
					 
					
						
						
							
							Introduce a final methods in View class  
						
						
						
					 
					
						2012-01-09 21:09:38 +01:00 
						 
				 
			
				
					
						
							
							
								Ewoud Kohl van Wijngaarden 
							
						 
					 
					
						
						
						
						
							
						
						
							0d64b4a704 
							
						 
					 
					
						
						
							
							Make a nested if flat  
						
						... 
						
						
						
						This is a possible fix for issue #73 .  The problem occurs when the first
if-statement is true, but the second is not. This results into the
variable obj not being set. This commit solves it by removing that
branch. 
						
					 
					
						2012-01-09 15:56:41 +01:00 
						 
				 
			
				
					
						
							
							
								Sebastian Żurek 
							
						 
					 
					
						
						
						
						
							
						
						
							10adf4c31a 
							
						 
					 
					
						
						
							
							QueryMixin class updates (comments + docs and the definition of get_instance_data method)  
						
						
						
					 
					
						2012-01-08 23:10:21 +01:00