| 
							
							
								 Tom Christie | d199a89c18 | Merge branch 'master' of https://github.com/tomchristie/django-rest-framework | 2013-05-14 11:40:43 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6487fa535b | Added @avinash240 for bugfix #822 | 2013-05-14 11:39:30 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 727a64f3b9 | Updated release notes | 2013-05-14 11:38:55 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a303d0f38c | Fix filter test renaming | 2013-05-14 11:37:59 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ce1a04a603 | Merge branch 'master' of https://github.com/avinash240/django-rest-framework | 2013-05-14 11:34:47 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2cff6e69db | Added OrderingFilter | 2013-05-14 11:27:08 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6a037f63ed | Added OrderingFilter | 2013-05-14 11:27:03 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 08bc976269 | Rename filter tests | 2013-05-14 10:16:46 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | aa0dcd2e4a | More docs on SearchFilter | 2013-05-14 10:16:00 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b2bf5f1f88 | SearchFilter may be comma and/or whitespace seperated | 2013-05-14 10:10:44 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 752c01420f | Fix Django 1.3 compat with routers | 2013-05-14 10:01:05 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f9aeb68383 | Updated release notes | 2013-05-14 09:59:29 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 1154d873e9 | Added django-viewsets to credits.  Refs #738. | 2013-05-13 13:35:16 +02:00 |  | 
			
				
					| 
							
							
								 Marlon Bailey | 5e2d8052d4 | fix test case to work with Python 3 and make it more explicit | 2013-05-12 09:22:14 -04:00 |  | 
			
				
					| 
							
							
								 Marlon Bailey | 9d2580dccf | added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base | 2013-05-11 22:26:34 -04:00 |  | 
			
				
					| 
							
							
								 Tom Christie | fd4a66cfc7 | Fix py3k compat with functools.reduce | 2013-05-10 23:06:42 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | dd51d369c8 | Unicode string fix | 2013-05-10 23:02:24 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 260a8125c5 | Improve custom filtering example | 2013-05-10 22:56:23 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 293dc3e6d8 | Added SearchFilter | 2013-05-10 22:33:11 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 8ce36d2bf1 | SearchFilter and tests | 2013-05-10 21:57:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 773a92eab3 | Move models into test modules, out of models module | 2013-05-10 21:57:05 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | fd84cf7f10 | Docs tweaks | 2013-05-10 21:56:33 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2e3032ff8c | Added @hamishcampbell for docs fix #818. Thanks! | 2013-05-10 14:14:42 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 6aed4381c0 | Merge pull request #818 from hamishcampbell/master Very minor documentation code fix. | 2013-05-10 05:13:28 -07:00 |  | 
			
				
					| 
							
							
								 Hamish Campbell | 5c8356d51d | Fix minor code error in Generic Views documentation - missing ifstatement. | 2013-05-10 13:28:50 +12:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 0176a5391b | Fix HyperlinkedModelSerializer not respecting lookup_fields | 2013-05-09 17:09:40 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 939cc5adba | Tweak inheritance | 2013-05-09 13:35:01 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 31f94ab409 | Added GenericViewSet and docs tweaking | 2013-05-09 13:31:42 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | f2466418dd | Tweak doc text slightly | 2013-05-09 13:14:20 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3737e17d7c | Added 'Customizing the generic views' section.  Closes #816 | 2013-05-09 13:10:45 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 4ab7b8f257 | Version 2.3.2 | 2013-05-08 20:49:49 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | b443560080 | Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings.  Closes #798 | 2013-05-08 20:38:50 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | de69a28b9e | Test and fix for #814. | 2013-05-08 20:18:01 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9d59e55cec | Merge branch 'master' of https://github.com/tomchristie/django-rest-framework | 2013-05-08 20:09:03 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 2379014f15 | Add rails in credits section | 2013-05-08 20:08:35 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 429e078eee | Allow None filename on uploaded files | 2013-05-08 20:07:51 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 673a7a496f | Update generic-views.md | 2013-05-08 10:17:27 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 42ba5b425b | Added @dhepper for typo fixes in #812. | 2013-05-08 10:02:52 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 9b4bf66245 | Merge pull request #812 from dhepper/master Fixed typos in tutorial | 2013-05-08 01:01:25 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | dabe119af5 | Typo | 2013-05-07 20:35:33 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Hepper | 70b8e5b759 | Fixed typos in tutorial | 2013-05-07 19:16:03 +02:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 246a376dcf | Merge branch 'master' of https://github.com/tomchristie/django-rest-framework | 2013-05-07 17:26:17 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a758066c03 | Added @eyepulp for fix #810 | 2013-05-07 17:25:51 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 71df55148c | Merge pull request #810 from EyePulp/patch-1 Updated the README.md example to fix a class reference | 2013-05-07 09:17:54 -07:00 |  | 
			
				
					| 
							
							
								 Tom Christie | a8e090df04 | Remove accidental conflict diff | 2013-05-07 17:14:25 +01:00 |  | 
			
				
					| 
							
							
								 EyePulp | ea91298101 | Updated the README.md example to fix a class reference Two classnames in the example had "views." prepended to them, which appeared unnecessary. | 2013-05-07 11:01:54 -05:00 |  | 
			
				
					| 
							
							
								 Tom Christie | d7c08222f1 | Fix breadcrumb rendering issue | 2013-05-07 14:11:48 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | ed2cf180c9 | Version 2.3.0 | 2013-05-07 13:29:38 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 3353889ae8 | Docs for FileUploadParser | 2013-05-07 13:27:27 +01:00 |  | 
			
				
					| 
							
							
								 Tom Christie | 642970a1b8 | Merge pull request #806 from wronglink/master Added FileUploadParser | 2013-05-07 05:09:09 -07:00 |  |