Commit Graph

1266 Commits

Author SHA1 Message Date
Adam Charnock
5e6f4cf302 Further work on django quickstart 2015-12-29 14:18:32 +00:00
Adam Charnock
90f58e786a Merge branch 'feature/django' into feature/django-docs 2015-12-29 13:31:31 +00:00
Adam Charnock
58421cda14 Merge remote-tracking branch 'graphql/master' into feature/django 2015-12-29 13:30:05 +00:00
Adam Charnock
7182aeec17 Minor updates to django-quickstart 2015-12-29 13:29:20 +00:00
Syrus Akbary
062c0f9ed5 Merge pull request #73 from lightning18/dump-schema
Implement Django command for dumping schema.json
2015-12-18 19:24:22 +01:00
Kevin Abiera
73c04f22c8
Implement Django command for dumping schema.json
* Implement Django `./manage.py graphql_schema`

* Required to have 'graphene.django.contrib' in INSTALLED_APPS setting

* Introduces two new optional settings GRAPHENE_SCHEMA and
  GRAPHENE_SCHEMA_OUTPUT

* GRAPHENE_SCHEMA for the Django app containing the schema

* GRAPHENE_SCHEMA_OUTPUT for the output file (defaults to schema.json)

* Use `./manage.py graphql_schema -h` for help in command line
2015-12-18 20:57:24 +08:00
Syrus Akbary
9b8c75be9a Merge pull request #71 from lightning18/ip-address-field
Add support for GenericIPAddressField
2015-12-12 10:58:57 -08:00
Kevin Abiera
6c0bc4c545
Add support for GenericIPAddressField 2015-12-12 22:16:20 +08:00
Adam Charnock
6562a78b99 Merge pull request #1 from syrusakbary/feature/adam-django
Fixed tests and merged most recent code changes
2015-12-12 09:44:17 +00:00
Syrus Akbary
c7026329d3 Moved django filter tests 2015-12-12 00:54:51 -08:00
Syrus Akbary
8eaa2cfc49 Fixed compatibility with Django 1.6, 1.7, 1.8 and 1.9 2015-12-12 00:51:31 -08:00
Syrus Akbary
35d78320e8 Simplified filter in types and fields. All tests passing 2015-12-11 23:39:41 -08:00
Syrus Akbary
b4f7df3c9d Fixed argument getter in django filters tests 2015-12-11 15:43:22 -08:00
Syrus Akbary
90889ca455 Merge branch 'master' of github.com:graphql-python/graphene 2015-12-11 14:00:48 -08:00
Syrus Akbary
0daf6d8ec0 Merge pull request #69 from ustun/improve_object_argument_docs
Add documentation about using custom input object types as arguments
2015-12-11 13:55:31 -08:00
Syrus Akbary
689db2c70e Fixed incompatible syntax in Python 2.7 2015-12-11 11:03:49 -08:00
Syrus Akbary
cdfe7bd33e Merge branch 'refs/heads/master' into feature/adam-django 2015-12-11 10:59:55 -08:00
Syrus Akbary
9dcd7986b8 Improved testing on fields 2015-12-11 10:53:05 -08:00
Syrus Akbary
2eea03cb62 Improved name in Field. Could be an Argument 2015-12-11 10:42:10 -08:00
Ustun Ozgur
ab9d382cdf Add documentation about using custom input object types as arguments
Proper indentation

Add secondary field to make the intent explicit
2015-12-11 20:02:15 +02:00
Syrus Akbary
e27af63f3a Updated version to 0.5.0 2015-12-10 22:27:56 -08:00
Syrus Akbary
930f084912 Fixed DjangoDebugPlugin. Improved Django views 2015-12-10 22:11:43 -08:00
Syrus Akbary
a161738f3d Merge pull request #65 from graphql-python/features/plugins-autocamelcase
Create plugin structure
2015-12-09 19:52:12 -08:00
Syrus Akbary
64460839be Merge pull request #64 from graphql-python/features/django-debug
Add plugin to debug Django SQL queries in the Query (similar to DjangoDebugToolbar)
2015-12-09 19:48:57 -08:00
Syrus Akbary
c8f4c13822 Improved plugin execution 2015-12-09 19:44:35 -08:00
Syrus Akbary
b3b440f837 Merge branch 'refs/heads/features/plugins-autocamelcase' into features/django-debug 2015-12-09 19:28:43 -08:00
Syrus Akbary
dca435a220 Improved plugin system 2015-12-09 19:26:46 -08:00
Syrus Akbary
dd5b26e6ed Improved debug plugin structure 2015-12-06 16:51:37 -08:00
Syrus Akbary
bd35fcee6c Merge branch 'refs/heads/features/plugins-autocamelcase' into features/django-debug 2015-12-06 16:39:32 -08:00
Syrus Akbary
cd5d9b8eea Improved plugin structure based on @adamcharnock suggestions 2015-12-06 16:34:47 -08:00
Syrus Akbary
730de3f289 Merge branch 'refs/heads/master' into features/plugins-autocamelcase
Conflicts:
	graphene/core/types/argument.py
2015-12-06 16:04:44 -08:00
Syrus Akbary
2724025a5b Improved ScalarTypes code 2015-12-06 15:53:56 -08:00
Syrus Akbary
37a454b831 Renamed BaseType to InstanceType for code clarity 2015-12-06 15:49:54 -08:00
Syrus Akbary
9e1dd8e314 Merge branch 'refs/heads/master' into features/plugins-autocamelcase
Conflicts:
	graphene/core/schema.py
2015-12-06 15:43:57 -08:00
Syrus Akbary
5e708cc919 Improved tests. Improved schema.type getter. Remove duplicated Scalar code 2015-12-06 15:32:31 -08:00
Syrus Akbary
9ea10f562c Fixed lint errors 2015-12-06 14:37:44 -08:00
Syrus Akbary
c9e7f67ff9 Improved logic in GroupNamedType 2015-12-06 14:36:47 -08:00
Syrus Akbary
a153a01f6b Improved debug using plugin structure 2015-12-06 03:59:44 -08:00
Adam Charnock
3d4f593300 DjangoFilterConnectionField now extends ConnectionField, as DjangoConnectionField is now deprecated 2015-12-06 10:38:28 +00:00
Syrus Akbary
2ad5bc203a Merge branch 'refs/heads/features/plugins-autocamelcase' into features/django-debug 2015-12-06 02:37:21 -08:00
Syrus Akbary
12e4e2c006 Added Plugins structure. Added option in schema for auto camel case or not. 2015-12-06 02:35:17 -08:00
Adam Charnock
93e758dc13 Reverting previous commit following comments by @syrusakbary 2015-12-06 10:08:10 +00:00
Syrus Akbary
ec3f292593 Refactored arguments and fields logic 2015-12-06 01:51:03 -08:00
Syrus Akbary
21dffa4aa8 Moved fields to a named group 2015-12-06 01:34:56 -08:00
Syrus Akbary
fae376cbb0 Moved arguments to a named group 2015-12-06 01:01:23 -08:00
Adam Charnock
880807dd2f Replacing django-filter detection with GRAPHENE_ENABLE_FILTERING setting
Also moving GRAPHENE_ORDER_BY_FIELD into settings.py which
centralises use of django settings and their default values
2015-12-05 13:06:44 +00:00
Adam Charnock
0f35f4de8d Correcting definition of 2015-12-05 11:20:48 +00:00
Adam Charnock
66189be4a9 Filtering now available on nodes without defining fields 2015-12-05 11:15:17 +00:00
Adam Charnock
afd7aa8d72 Merge branch 'master' into feature/django 2015-12-05 09:10:38 +00:00
Adam Charnock
bfd43bc995 Flake8 fixes 2015-12-05 09:03:19 +00:00