Jay Hale 
							
						 
					 
					
						
						
						
						
							
						
						
							d8bdda94df 
							
						 
					 
					
						
						
							
							Add back support for django-filter < 2  
						
						
						
					 
					
						2018-09-04 13:15:04 -04:00 
						 
				 
			
				
					
						
							
							
								Jay Hale 
							
						 
					 
					
						
						
						
						
							
						
						
							dc0c2900d1 
							
						 
					 
					
						
						
							
							Making GrapheneFilterSetMixin compatible with django_filter 2  
						
						
						
					 
					
						2018-09-04 13:15:04 -04:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							54ef52e1c6 
							
						 
					 
					
						
						
							
							Reformatted files using black  
						
						
						
					 
					
						2018-07-19 16:52:24 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							bb6da28008 
							
						 
					 
					
						
						
							
							Merge branch 'master' into form_mutations  
						
						
						
					 
					
						2018-06-05 13:31:29 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e5beb9eb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into form_mutations  
						
						... 
						
						
						
						# Conflicts:
#	graphene_django/forms/converter.py
#	graphene_django/forms/tests/test_converter.py 
						
					 
					
						2018-06-05 13:23:39 -07:00 
						 
				 
			
				
					
						
							
							
								= 
							
						 
					 
					
						
						
						
						
							
						
						
							43c0c99136 
							
						 
					 
					
						
						
							
							fix lint error  
						
						
						
					 
					
						2018-04-15 00:21:53 -04:00 
						 
				 
			
				
					
						
							
							
								= 
							
						 
					 
					
						
						
						
						
							
						
						
							b331319aea 
							
						 
					 
					
						
						
							
							Fix merge conflicts  
						
						
						
					 
					
						2018-04-15 00:12:49 -04:00 
						 
				 
			
				
					
						
							
							
								eyal0803 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e12c329507 
							
						 
					 
					
						
						
							
							Added support for Django 1.8.x  
						
						... 
						
						
						
						Since I didn't know why the `rel` attribute wasn't there in the first place, maybe it's better to use the `remote_field` only if it's there and leave `rel` as a default (i.e else). 
						
					 
					
						2018-02-23 12:20:37 +02:00 
						 
				 
			
				
					
						
							
							
								eyal0803 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e51f6070df 
							
						 
					 
					
						
						
							
							Fixes   #400  
						
						... 
						
						
						
						After more digging than I expected (and planned), I'm 99% sure that the problem comes from `graphene_django`.
I found a [comment](16436f3751/django/db/models/fields/reverse_related.py (L4-L6) 
						
					 
					
						2018-02-22 05:45:40 +02:00 
						 
				 
			
				
					
						
							
							
								= 
							
						 
					 
					
						
						
						
						
							
						
						
							384bff08e8 
							
						 
					 
					
						
						
							
							Add fallback for depracated atrribute  
						
						
						
					 
					
						2017-12-06 13:10:03 -05:00 
						 
				 
			
				
					
						
							
							
								= 
							
						 
					 
					
						
						
						
						
							
						
						
							d314d1041f 
							
						 
					 
					
						
						
							
							rel -> remote_field: Update Django DeprecatedAttribute  
						
						
						
					 
					
						2017-12-06 12:50:55 -05:00 
						 
				 
			
				
					
						
							
							
								= 
							
						 
					 
					
						
						
						
						
							
						
						
							62c0694901 
							
						 
					 
					
						
						
							
							models.DateField corresponds to graphene Date Scalar  
						
						
						
					 
					
						2017-12-05 15:04:29 -05:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							568073a090 
							
						 
					 
					
						
						
							
							Merge pull request  #325  from urbandove/master  
						
						... 
						
						
						
						Fix infinite recursion when sublassing DjangoFilterConnectionField 
						
					 
					
						2017-11-14 13:16:26 -08:00 
						 
				 
			
				
					
						
							
							
								= 
							
						 
					 
					
						
						
						
						
							
						
						
							3f08ed629c 
							
						 
					 
					
						
						
							
							Fix infinite recursion when sublassing DjangoFilterConnectionField and merging querysets  
						
						
						
					 
					
						2017-11-13 14:56:25 -05:00 
						 
				 
			
				
					
						
							
							
								Samuel Cormier-Iijima 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1db1cbdd9c 
							
						 
					 
					
						
						
							
							Fix passing request context to filterset creation  
						
						... 
						
						
						
						Currently this code throws an error about `context` not being defined. 
						
					 
					
						2017-11-13 12:47:55 -05:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bc59d0ad8e 
							
						 
					 
					
						
						
							
							Merge pull request  #232  from basilfx/master  
						
						... 
						
						
						
						Pass context object to FilterSet for request-baed filtering 
						
					 
					
						2017-11-13 02:39:18 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b8fb64d893 
							
						 
					 
					
						
						
							
							Merge branch 'master' into fix-select-related  
						
						
						
					 
					
						2017-11-13 02:31:15 -08:00 
						 
				 
			
				
					
						
							
							
								Charles Haro 
							
						 
					 
					
						
						
						
						
							
						
						
							4013f78ecb 
							
						 
					 
					
						
						
							
							fix default_queryset overriding queryset when merging queries  
						
						
						
					 
					
						2017-11-03 12:26:49 -07:00 
						 
				 
			
				
					
						
							
							
								Charles Haro 
							
						 
					 
					
						
						
						
						
							
						
						
							6d0837e7cb 
							
						 
					 
					
						
						
							
							add test to show annotation not being perservered  
						
						
						
					 
					
						2017-11-03 12:26:33 -07:00 
						 
				 
			
				
					
						
							
							
								Charles Haro 
							
						 
					 
					
						
						
						
						
							
						
						
							5491e2cb00 
							
						 
					 
					
						
						
							
							add test to show .reverse() not being perserved  
						
						
						
					 
					
						2017-11-03 12:25:22 -07:00 
						 
				 
			
				
					
						
							
							
								Jacob 
							
						 
					 
					
						
						
						
						
							
						
						
							1d76db8164 
							
						 
					 
					
						
						
							
							Use super for base queryset logic  
						
						
						
					 
					
						2017-10-14 13:23:08 -05:00 
						 
				 
			
				
					
						
							
							
								Cameron Dawson 
							
						 
					 
					
						
						
						
						
							
						
						
							69cec060d8 
							
						 
					 
					
						
						
							
							Fix select_related with filtering  
						
						
						
					 
					
						2017-10-14 13:23:08 -05:00 
						 
				 
			
				
					
						
							
							
								Grant McConnaughey 
							
						 
					 
					
						
						
						
						
							
						
						
							666ddb2ff3 
							
						 
					 
					
						
						
							
							Merge form converter modules  
						
						
						
					 
					
						2017-10-02 09:42:57 -05:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							3d58148f03 
							
						 
					 
					
						
						
							
							Code adapted to new resolver API  
						
						
						
					 
					
						2017-07-28 09:43:27 -07:00 
						 
				 
			
				
					
						
							
							
								Bas Stottelaar 
							
						 
					 
					
						
						
						
						
							
						
						
							4bdcf054eb 
							
						 
					 
					
						
						
							
							Pass context object to FilterSet instance to support request-baed filtering ( fixes   #203 ).  
						
						
						
					 
					
						2017-07-28 16:46:39 +02:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							6ceb07c51c 
							
						 
					 
					
						
						
							
							Improved resolver consistency  
						
						
						
					 
					
						2017-07-26 23:36:08 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							72529b70bb 
							
						 
					 
					
						
						
							
							Fixed all tests and flake issues  
						
						
						
					 
					
						2017-07-24 23:42:40 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							48bcccdac2 
							
						 
					 
					
						
						
							
							Improved integration with Graphene 2.0  
						
						
						
					 
					
						2017-07-24 22:27:50 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							46a1ddedd8 
							
						 
					 
					
						
						
							
							Added RELAY_CONNECTION_MAX_LIMIT and RELAY_CONNECTION_ENFORCE_FIRST_OR_LAST settings  
						
						... 
						
						
						
						Relay connections will be limited to 100 records by default. 
						
					 
					
						2017-04-15 02:15:17 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							cc03da0598 
							
						 
					 
					
						
						
							
							Moved tests to filter field tests  
						
						
						
					 
					
						2017-04-15 01:17:53 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							5833cb83be 
							
						 
					 
					
						
						
							
							Fixed filterset limit issue  
						
						
						
					 
					
						2017-04-15 01:00:02 -07:00 
						 
				 
			
				
					
						
							
							
								Niall 
							
						 
					 
					
						
						
						
						
							
						
						
							fda876fdc2 
							
						 
					 
					
						
						
							
							Long-winded intersection using sets  
						
						
						
					 
					
						2017-03-06 19:41:45 +00:00 
						 
				 
			
				
					
						
							
							
								Niall 
							
						 
					 
					
						
						
						
						
							
						
						
							69457cffdf 
							
						 
					 
					
						
						
							
							Attempt fix. Breaks tests  
						
						
						
					 
					
						2017-03-06 18:13:40 +00:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							4cc46736bf 
							
						 
					 
					
						
						
							
							Simplified DjangoFilterConnectionField logic  
						
						
						
					 
					
						2017-03-02 18:00:05 -08:00 
						 
				 
			
				
					
						
							
							
								Tony Angerilli 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							57dbcd34f4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remote/master' into recursive-nodes  
						
						
						
					 
					
						2017-02-28 23:40:46 -08:00 
						 
				 
			
				
					
						
							
							
								Nick Hudkins 
							
						 
					 
					
						
						
						
						
							
						
						
							15664bdc0b 
							
						 
					 
					
						
						
							
							accept connections for DjangoFilterConnectionField  
						
						
						
					 
					
						2017-01-27 10:47:56 -05:00 
						 
				 
			
				
					
						
							
							
								Tony Angerilli 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e82ee8816c 
							
						 
					 
					
						
						
							
							Revert "adding the option of defining a filterset_class in the Meta class"  
						
						... 
						
						
						
						This reverts commit 9b1c1b4bad 
						
					 
					
						2017-01-23 22:18:09 -08:00 
						 
				 
			
				
					
						
							
							
								Elena 
							
						 
					 
					
						
						
						
						
							
						
						
							9b1c1b4bad 
							
						 
					 
					
						
						
							
							adding the option of defining a filterset_class in the Meta class  
						
						
						
					 
					
						2017-01-23 17:40:07 -08:00 
						 
				 
			
				
					
						
							
							
								Nick Hudkins 
							
						 
					 
					
						
						
						
						
							
						
						
							0200b3244c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into recursive-nodes  
						
						
						
					 
					
						2017-01-13 10:16:13 -05:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							9216772315 
							
						 
					 
					
						
						
							
							Removed unused imports  
						
						
						
					 
					
						2016-11-23 02:30:14 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							b3fbac5818 
							
						 
					 
					
						
						
							
							Fixed tests  
						
						
						
					 
					
						2016-11-23 02:28:21 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							8dfe7bbcf5 
							
						 
					 
					
						
						
							
							Remove filter order_by as Django Filters have deprecated it in 1.0  
						
						
						
					 
					
						2016-11-23 02:15:05 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							48993ddca0 
							
						 
					 
					
						
						
							
							Fixed order_by  
						
						
						
					 
					
						2016-11-23 01:20:10 -08:00 
						 
				 
			
				
					
						
							
							
								Tony Angerilli 
							
						 
					 
					
						
						
						
						
							
						
						
							207f4ebb41 
							
						 
					 
					
						
						
							
							added a test and made the type property better  
						
						
						
					 
					
						2016-11-14 23:44:50 -08:00 
						 
				 
			
				
					
						
							
							
								Tony Angerilli 
							
						 
					 
					
						
						
						
						
							
						
						
							dc6e8f110a 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
					 
					
						2016-11-14 10:40:47 -08:00 
						 
				 
			
				
					
						
							
							
								Tony Angerilli 
							
						 
					 
					
						
						
						
						
							
						
						
							3e5ae5a3d1 
							
						 
					 
					
						
						
							
							don’t try to access the type until after initialization  
						
						... 
						
						
						
						this allows for fields in a node (using a DjangoFilterConnectionField) that reference themselves 
						
					 
					
						2016-10-21 17:41:07 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							60bcc0beef 
							
						 
					 
					
						
						
							
							Use filter label as argument description.  Fixed   #16  
						
						
						
					 
					
						2016-10-15 18:21:54 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							c8c403edfd 
							
						 
					 
					
						
						
							
							Fixed django-filter integration (0.15)  
						
						
						
					 
					
						2016-09-20 23:50:28 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							4e23c3ccf6 
							
						 
					 
					
						
						
							
							Improved python syntax and sorts (pep8). Improved Readme  
						
						
						
					 
					
						2016-09-17 17:09:56 -07:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							0434899b4e 
							
						 
					 
					
						
						
							
							Isolated Graphene Django in a new package  
						
						
						
					 
					
						2016-09-17 16:31:17 -07:00