| 
							
							
								 Jonas Liljestrand | 3c1b5c3435 | indent error | 2012-11-17 17:53:08 +01:00 |  | 
			
				
					| 
							
							
								 Jonas Liljestrand | f0d4232c1d | Django 1.5 support, and awareness for AUTH_USER_MODEL | 2012-11-17 17:46:16 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 346a79b170 | Added @MechanisM - Thanks! (That's a mighty kick ass Gravatar) | 2012-11-17 00:29:15 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d0524cfcc3 | Merge pull request #423 from MechanisM/patch-1 Missing import of "Permission" model in docs | 2012-11-16 16:22:56 -08:00 |  | 
			
				
					| 
							
							
								 Eugene MechanisM | 4068323df4 | Missing import of "Permission" model in docs Missing import of "Permission" model in docs | 2012-11-17 04:03:43 +04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2263ed8b94 | Tweak | 2012-11-16 23:24:36 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 0eba278e13 | Improve pagination docs | 2012-11-16 23:22:23 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | acbe991209 | Tidying | 2012-11-16 23:22:15 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 016ef5019f | Version 2.1.3 | 2012-11-16 22:58:22 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e801e21210 | Merge pull request #422 from markotibold/max_length_for_modelserializers Max length for modelserializers | 2012-11-16 14:54:16 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 19b0516bfe | Getting 2.1.3 release notes ready | 2012-11-16 22:49:28 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | e40000c834 | Merge pull request #408 from markotibold/file_and_image_fields Added a FileField and an ImageField | 2012-11-16 14:48:42 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 31f01bd631 | Polishing to page size query parameters & more docs | 2012-11-16 22:45:57 +00:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | f801e5d305 | Simplified docs a bit for FileField and ImageField. Added note about MultipartParser only supporting file uploads and Django's default upload handlers. | 2012-11-16 23:44:55 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | 0076e2f462 | Added brief docs for URLField and SlugField. | 2012-11-16 23:23:34 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9973cf329a | Merge pull request #412 from minddust/custom_page_size_per_request support for custom page size per request | 2012-11-16 13:45:27 -08:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | 1a436dd6d9 | Added URLField and SlugField. Fixed test_modelserializer_max_length_exceeded | 2012-11-16 22:43:16 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8d3581f4bd | Minor tweaks to internals of generics and mixins | 2012-11-16 21:27:34 +00:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | f385b72d80 | Whoops … Drop pdb | 2012-11-16 22:20:26 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | aa013a4289 | Fixes #421 | 2012-11-16 22:18:57 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3cfb23e4ac | Merge pull request #419 from markotibold/the_feature_nobody_asked_for ./mkdocs.py -p opens a preview in your default browser | 2012-11-16 12:59:19 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2f2bde69e4 | Docs, tox and travis use django-filter 0.5.4 | 2012-11-16 20:58:49 +00:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | 4edc801d59 | Reproduces #421 | 2012-11-16 21:42:04 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | c5765641a4 | Fix typo | 2012-11-16 17:28:08 +00:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | b4cfb46a56 | WIP on docs for File- and ImageFileds. | 2012-11-16 00:22:08 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | cba181f4bc | ./mkdocs.py -p opens a preview in your default browser. Tested on Mac, but should work on windows and Linux as well. | 2012-11-15 23:31:53 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | 403886b79b | Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into file_and_image_fields | 2012-11-15 22:48:22 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | a701a21587 | added page_size_kwarg tests | 2012-11-15 14:35:34 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | 3ae203a018 | updated script to just use page_size_kwarg | 2012-11-15 12:06:43 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | b17a981800 | updated release noted for page_size stuff | 2012-11-15 11:24:17 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | 38e94bb8b4 | added global and per resource on/off switch + updated docs | 2012-11-15 11:15:05 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | 3b258d69c9 | Fix 404 Fixes #417 | 2012-11-14 23:24:18 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | 69a01d7125 | Added a test for the FileField. | 2012-11-14 23:04:46 +01:00 |  | 
			
				
					| 
							
							
								 Rob Romano | d541e0c423 | Merge branch 'master' of https://github.com/robromano/django-rest-framework Conflicts:
	docs/api-guide/authentication.md
	docs/topics/credits.md | 2012-11-14 13:01:43 -08:00 |  | 
			
				
					| 
							
							
								 Rob Romano | 535b65a348 | Removed authtoken/urls.py, not really needed with Tom's simplification | 2012-11-14 12:59:01 -08:00 |  | 
			
				
					| 
							
							
								 Rob Romano | 321ba156ca | Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, updated tests & docs. Left authtoken.urls in place as example. | 2012-11-14 12:51:00 -08:00 |  | 
			
				
					| 
							
							
								 Rob Romano | eb20b5663e | Added documentation on how to use the token authentication login view. | 2012-11-14 12:48:03 -08:00 |  | 
			
				
					| 
							
							
								 Rob Romano | ce3ccb91dc | Updates to login view for TokenAuthentication from feedback from Tom | 2012-11-14 12:46:14 -08:00 |  | 
			
				
					| 
							
							
								 Rob Romano | bd92db3c67 | Added authtoken login/logout urlpatterns and views | 2012-11-14 12:46:14 -08:00 |  | 
			
				
					| 
							
							
								 Rob Romano | 4a2526bd1e | Added authtoken login/logout urlpatterns and views to support scripted logins and logouts using TokenAuthentication. Added unittests. | 2012-11-14 12:46:14 -08:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | e112a806d8 | .to_native() now returns the file-name. | 2012-11-14 21:40:52 +01:00 |  | 
			
				
					| 
							
							
								 Marko Tibold | c35b9eb065 | Processed review comments. No type checking in .restore_fields()
Added missing BytesIO import. | 2012-11-14 21:13:23 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 647abcdb16 | Bring keywrod args in line with Django's implementation | 2012-11-14 19:34:27 +00:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 0cfb27b40e | Merge pull request #407 from ludwigkraatz/location_header Location header when Creating a Resource with HyperlinkedIdentityField | 2012-11-14 10:42:08 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a83eb748c1 | Merge pull request #413 from minddust/auth_token_documentation added description how to use the auth token | 2012-11-14 10:41:15 -08:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9e1f82c35f | Merge pull request #414 from minddust/minor_fixes fixed some typos | 2012-11-14 10:39:42 -08:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | 44ff2e0add | fixed some typos | 2012-11-14 19:36:29 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | 1e83b60a43 | added description how to use the auth token | 2012-11-14 18:00:59 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | 5967f15f7f | updated docs | 2012-11-14 16:11:35 +01:00 |  | 
			
				
					| 
							
							
								 Stephan Groß | 33fe0d2bea | added release note | 2012-11-14 16:08:14 +01:00 |  |