Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							993a3751c4 
							
						 
					 
					
						
						
							
							Work on travis excludes  
						
						
						
					 
					
						2015-12-04 16:21:43 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							4398f6d6bd 
							
						 
					 
					
						
						
							
							Removing debug line from travis.yml. Omitting --download-cache seems to fix the issue  
						
						
						
					 
					
						2015-12-04 16:19:30 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							e8f491c1ff 
							
						 
					 
					
						
						
							
							Debugging travis django install  
						
						
						
					 
					
						2015-12-04 16:13:45 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							1bace349da 
							
						 
					 
					
						
						
							
							Updating travis config to build for multiple django versions  
						
						
						
					 
					
						2015-12-04 16:00:17 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							818b910991 
							
						 
					 
					
						
						
							
							Now supports django 1.9  
						
						
						
					 
					
						2015-12-04 15:46:48 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							c42d4a763d 
							
						 
					 
					
						
						
							
							Removing debug line  
						
						
						
					 
					
						2015-12-04 14:10:31 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							79e1b1c996 
							
						 
					 
					
						
						
							
							Removing unused imports  
						
						
						
					 
					
						2015-12-04 14:10:06 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							e7d7fad068 
							
						 
					 
					
						
						
							
							Remove django app loading which is no longer required post merge  
						
						
						
					 
					
						2015-12-04 13:58:39 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							7d2ec21855 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/django  
						
						
						
					 
					
						2015-12-04 13:58:00 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							713e148f29 
							
						 
					 
					
						
						
							
							Work in progress on loading django models for tests  
						
						
						
					 
					
						2015-12-04 13:57:01 +00:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							28414955a2 
							
						 
					 
					
						
						
							
							Improved resolver function decorators  
						
						
						
					 
					
						2015-12-03 23:41:28 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							967a9d2d03 
							
						 
					 
					
						
						
							
							Fixed old DjangoConnectionField usage  
						
						
						
					 
					
						2015-12-03 23:23:32 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							0fa7f5c9aa 
							
						 
					 
					
						
						
							
							Improved tests  
						
						
						
					 
					
						2015-12-03 21:49:10 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							f4cfd7dc8a 
							
						 
					 
					
						
						
							
							Improved package imports  
						
						
						
					 
					
						2015-12-03 20:50:14 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							256a94bc81 
							
						 
					 
					
						
						
							
							Improved travis build  
						
						
						
					 
					
						2015-12-03 19:10:11 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							53de24b705 
							
						 
					 
					
						
						
							
							Improved django example  
						
						
						
					 
					
						2015-12-03 18:34:38 -08:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							be6b2bf290 
							
						 
					 
					
						
						
							
							Adding comments to filter_for_reverse_field()  
						
						
						
					 
					
						2015-12-04 01:57:43 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							64ec0ca94f 
							
						 
					 
					
						
						
							
							Adding support for filtering on to-many fields  
						
						
						
					 
					
						2015-12-03 23:13:37 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8eac9cdf 
							
						 
					 
					
						
						
							
							removing stray commented line  
						
						
						
					 
					
						2015-12-03 21:16:09 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							6e07ef0c38 
							
						 
					 
					
						
						
							
							Ordering parameter now called 'order' rather than 'o'  
						
						... 
						
						
						
						This can be customsied via the GRAPHENE_ORDER_BY_FIELD setting,
or by extending GrapheneFilterSet.
I'm open to this being called 'order_by'. 
						
					 
					
						2015-12-03 21:07:44 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							4f054b3640 
							
						 
					 
					
						
						
							
							Adding django-filter to .travis.yml  
						
						... 
						
						
						
						As pip doesn't seem inclined to pickup on tests_require 
						
					 
					
						2015-12-03 20:53:10 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							375dfcbcc2 
							
						 
					 
					
						
						
							
							Fixing flake8 errors  
						
						
						
					 
					
						2015-12-03 20:48:29 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							fb45a83925 
							
						 
					 
					
						
						
							
							Moving django-filter dependent code into graphene.contrib.django.filter  
						
						... 
						
						
						
						Graphene should now run fine without django-filter. Tests will
also run without django-filter. However, I'm leaving it as a
requirement in setup.py's `tests_require` setting as testing
without it is probably not to be encouraged. 
						
					 
					
						2015-12-03 20:01:37 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							3709f9450b 
							
						 
					 
					
						
						
							
							Refactoring filterset creation logic  
						
						... 
						
						
						
						I have moved it from `DjangoFilterConnectionField` and pushed it
down into `FilterConnectionResolver` where I think it makes
more sense for it to live.
I have also pulled out `get_filtering_args_from_filterset()` as
a utility method. 
						
					 
					
						2015-12-03 19:22:23 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							70024ed0eb 
							
						 
					 
					
						
						
							
							Fixes for python 2.7 & PyPy  
						
						
						
					 
					
						2015-12-03 18:21:28 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							70cedc046f 
							
						 
					 
					
						
						
							
							Adding support for filtering by global ID  
						
						... 
						
						
						
						This is supported for AutoFields, OneToOneFields, and ForeignKey.
I have also added the GrapheneFilterSet base class. This provides
customsiations needed for Graphene. However, making developers
tie their FilterSets to Graphene would not be ideal as it would
prevent their use elsewhere. I therefore wrap any FilterSets
provided to Graphene with this additional functionality.
See `setup_filterset()` for how this is done. Such FilterSets
are also created by `custom_filterset_factory()` (in times
when a filterset is implicitly required via the `fields`
or `order_by` params passed to `DjangoFilterConnectionField`. 
						
					 
					
						2015-12-03 17:55:41 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							463c1f98df 
							
						 
					 
					
						
						
							
							Relocating UUID form field import code from converter.py to form_converter.py  
						
						
						
					 
					
						2015-12-03 13:37:29 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							49258827f8 
							
						 
					 
					
						
						
							
							DjangoFilterConnectionField now accepts fields, order_by, and extra_filter_meta  
						
						
						
					 
					
						2015-12-03 13:32:43 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							7bfeb086a4 
							
						 
					 
					
						
						
							
							Adding filter tests  
						
						
						
					 
					
						2015-12-03 12:52:15 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							b9f93918c8 
							
						 
					 
					
						
						
							
							Simplifying get_filterset_kwargs() as ImproperlyConfigured cannot be raised  
						
						
						
					 
					
						2015-12-03 12:50:00 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							930f7179d0 
							
						 
					 
					
						
						
							
							Adding tests for SimpleQuerySetConnectionResolver  
						
						
						
					 
					
						2015-12-03 12:08:22 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							e270792674 
							
						 
					 
					
						
						
							
							No need to create a Schema in test_fields.py  
						
						
						
					 
					
						2015-12-03 11:42:08 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							0c7be5c86e 
							
						 
					 
					
						
						
							
							pep8 fixes  
						
						
						
					 
					
						2015-12-03 11:30:14 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							d959cf5a84 
							
						 
					 
					
						
						
							
							Adding tests for DjangoFilterConnectionField  
						
						
						
					 
					
						2015-12-03 11:09:34 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							4a087ecb24 
							
						 
					 
					
						
						
							
							Adding tests for form field conversion  
						
						
						
					 
					
						2015-12-03 10:46:43 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							a5d73ac211 
							
						 
					 
					
						
						
							
							pep8 fixes  
						
						
						
					 
					
						2015-12-03 10:07:21 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							377e3f66cd 
							
						 
					 
					
						
						
							
							Adding PyCharm entry to .gitignore  
						
						
						
					 
					
						2015-12-03 10:05:59 +00:00 
						 
				 
			
				
					
						
							
							
								Adam Charnock 
							
						 
					 
					
						
						
						
						
							
						
						
							6e63e7b42d 
							
						 
					 
					
						
						
							
							Work on Django integration as per  #48  
						
						... 
						
						
						
						Discussion can be found here:
https://github.com/graphql-python/graphene/issues/48 
Original gist can be found here:
https://gist.github.com/adamcharnock/ad051b419d4c613d40fe  
						
					 
					
						2015-12-03 10:05:59 +00:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							699aebec33 
							
						 
					 
					
						
						
							
							Merge pull request  #61  from graphql-python/features/classtypes  
						
						... 
						
						
						
						Refactor ObjectTypes in ClassTypes. Fixed  #30  
						
					 
					
						2015-12-02 23:59:51 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							d251a52442 
							
						 
					 
					
						
						
							
							Fixed Python3 import error  
						
						
						
					 
					
						2015-12-02 23:54:45 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							df9dd33c74 
							
						 
					 
					
						
						
							
							Fixed Python3 errors  
						
						
						
					 
					
						2015-12-02 23:48:40 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							9b839f19e5 
							
						 
					 
					
						
						
							
							Fixed lint errors  
						
						
						
					 
					
						2015-12-02 23:46:49 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							b417a65f19 
							
						 
					 
					
						
						
							
							Fixed options tests  
						
						
						
					 
					
						2015-12-02 23:42:22 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							f5837ac4f3 
							
						 
					 
					
						
						
							
							Improved classtypes django support  
						
						
						
					 
					
						2015-12-02 23:36:51 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							5b3000f734 
							
						 
					 
					
						
						
							
							Improved classtypes relay support  
						
						
						
					 
					
						2015-12-02 22:47:37 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							8abcaff02b 
							
						 
					 
					
						
						
							
							Improved classtypes core support  
						
						
						
					 
					
						2015-12-02 21:11:24 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							398f7da24c 
							
						 
					 
					
						
						
							
							Added FieldsClassType inheritance  
						
						
						
					 
					
						2015-12-02 20:44:02 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							afc5e2720b 
							
						 
					 
					
						
						
							
							Added NonNull, List definitions to ClassTypes  
						
						
						
					 
					
						2015-12-02 20:28:53 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							3363f588fe 
							
						 
					 
					
						
						
							
							First working version class types  
						
						
						
					 
					
						2015-12-02 20:11:28 -08:00 
						 
				 
			
				
					
						
							
							
								Syrus Akbary 
							
						 
					 
					
						
						
						
						
							
						
						
							e78936c424 
							
						 
					 
					
						
						
							
							Fixed tests  
						
						
						
					 
					
						2015-12-02 01:33:41 -08:00