Commit Graph

893 Commits

Author SHA1 Message Date
Syrus Akbary
9351626ad8
Merge pull request #483 from adamchainz/patch-1
Reword 'abstract' -> 'mixin' in plain tutorial
2018-08-01 11:52:56 -07:00
Adam Johnson
1ba9652f38
Reword 'abstract' -> 'mixin' in plain tutorial
More technically correct
2018-08-01 12:51:46 +01:00
Syrus Akbary
52d14f3b8a
Merge pull request #475 from NoumirPoutipou/master
Pin an explicit version of django-filter (<2) on cookbook example
2018-07-23 19:41:07 -07:00
Noumir.Poutipou
a57098b1cb Pin an explicit version of django-filter (<2) on cookbook example 2018-07-24 04:03:59 +02:00
Waldecir Santos
9cf52ca272 Merge branch 'master' of github.com:wsantos/graphene-django
# Conflicts:
#	graphene_django/forms/tests/test_mutation.py
2018-07-22 23:56:25 +01:00
Waldecir Santos
d4a9c2bb89 Fix tests. 2018-07-22 23:53:58 +01:00
Waldecir Santos
c1bd3c4c15 Exclude id from mutation, useful for create operations. 2018-07-22 23:35:11 +01:00
Waldecir Santos
74b6cf9919 Exclude id from mutation for update oprations 2018-07-22 23:34:01 +01:00
Syrus Akbary
dc561c68c4 Updated version to 2.1.0 2018-07-19 16:52:24 -07:00
Syrus Akbary
54ef52e1c6 Reformatted files using black 2018-07-19 16:52:24 -07:00
Syrus Akbary
96789b291f
Merge pull request #466 from ramonsaraiva/pin-filtering-docs
Pin django-filter in filtering docs
2018-07-19 16:46:32 -07:00
Syrus Akbary
f0705e2c25 Pin a explicit version of django-filter (<2) 2018-07-19 16:43:09 -07:00
Syrus Akbary
192ac963d9 Trying to fix tests 2018-07-19 16:39:24 -07:00
Ramon Saraiva
1c4182fd5d Pin django-filter in filtering docs until full compatibility with 2.0.0 2018-07-17 02:19:35 -03:00
Syrus Akbary
06ca766c38
Merge pull request #454 from ericfrederich/example_diff
Make examples diff better against each other
2018-06-18 19:33:05 -07:00
Syrus Akbary
2f68424717
Merge pull request #456 from ericfrederich/fix_doc_links
Fix moved link
2018-06-18 19:32:19 -07:00
Eric L Frederich
3e3584565f Fix moved link 2018-06-13 17:02:45 -04:00
Eric L Frederich
a97729d362 Make examples diff better against each other 2018-06-13 10:29:50 -04:00
Syrus Akbary
1755948768
Update __init__.py 2018-06-08 11:53:00 -07:00
Syrus Akbary
26cfa88f3a
Fixed non-deterministic setup.py. Related issue #427
This commit is trying to fix https://github.com/graphql-python/graphene-django/issues/427#issuecomment-395539715
2018-06-08 11:51:41 -07:00
Syrus Akbary
763665f2f6 Updated version to 2.1rc0 2018-06-05 15:21:11 -07:00
Syrus Akbary
9812c58a86
Merge pull request #334 from fusion44/master
Docs: Update Cookbook tutorial
2018-06-05 14:49:18 -07:00
Syrus Akbary
9840a64dc9
Merge branch 'master' into master 2018-06-05 14:48:53 -07:00
Syrus Akbary
701611c246
Moved the admin plug down to the proper section 2018-06-05 14:48:06 -07:00
Syrus Akbary
f0451476ad
Merge pull request #422 from tadeo/master
Fix doc: Bad documented SerializerMutation attribute
2018-06-05 14:41:58 -07:00
Syrus Akbary
27a7c0e299 Added support for FilePathField 2018-06-05 14:39:51 -07:00
Syrus Akbary
4e7b269b76
Merge pull request #450 from graphql-python/form_mutations
Form mutations
2018-06-05 14:36:44 -07:00
Syrus Akbary
a9d819e1f7 Removed repeated function 2018-06-05 14:24:41 -07:00
Syrus Akbary
be22f1639b Updated docs 2018-06-05 14:20:21 -07:00
Syrus Akbary
b1948d70bd Make graphene>=2.1 as a requirement 2018-06-05 14:17:21 -07:00
Syrus Akbary
10d2f3eea7 Commented the input form class, for now 2018-06-05 14:17:07 -07:00
Syrus Akbary
364d4f8f41 Merge branch 'master' into form_mutations 2018-06-05 13:32:45 -07:00
Syrus Akbary
546a82b7ec Updated time imports 2018-06-05 13:32:32 -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
Syrus Akbary
883d1778d5
Merge pull request #336 from urbandove/django2
support Django 2 + in tests
2018-06-05 13:02:09 -07:00
Syrus Akbary
7563045d75
Merge pull request #290 from DouglasConnect/fix-distinct-bug
Fix distinct bug
2018-06-05 12:57:19 -07:00
Syrus Akbary
205c177912 Removed abstract type from examples. 2018-06-05 12:53:47 -07:00
Syrus Akbary
1e6b2a569e
Merge pull request #441 from bollwyvl/add-license
Add license to repo
2018-06-05 12:48:09 -07:00
Syrus Akbary
490ed929ad
Merge pull request #449 from graphql-python/graphqlview-pluggable-backend
Graphqlview pluggable backend
2018-06-05 12:47:47 -07:00
Syrus Akbary
a65f786ba4 Fixed requirement 2018-06-05 12:31:25 -07:00
Syrus Akbary
4f47ffdc8d Updated graphql-core requirements 2018-06-05 12:19:37 -07:00
Syrus Akbary
33c6fdf5ab Added graphql-core min version to requirements 2018-06-05 01:24:53 -07:00
Nicholas Bollweg
2a05ac7ed1 add license to repo 2018-05-25 01:28:51 -04:00
=
43c0c99136 fix lint error 2018-04-15 00:21:53 -04:00
=
ea2d60d3df update pytest django version 2018-04-15 00:13:49 -04:00
=
b331319aea Fix merge conflicts 2018-04-15 00:12:49 -04:00
Tadeo Carrier
b1245fed16 Fix doc: Bad documented SerializerMutation attribute 2018-04-05 14:46:10 -03:00
Syrus Akbary
a480a39713
Merge pull request #326 from pizzapanther/drf-serializer-update
DRF Serializer update
2018-03-29 23:22:14 -07:00
Syrus Akbary
70dffa94e7
Merge pull request #212 from maqquettex/fix_cbv_inheritance
Inheritance support for GraphQLView (class attributes)
2018-03-29 23:19:29 -07:00