Commit Graph

460 Commits

Author SHA1 Message Date
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
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
Syrus Akbary
d2c1e7c87b
Merge pull request #391 from mongkok/test-custom-meta-setdefault
Test DjangoObjectType custom meta .setdefault()
2018-03-29 21:02:35 -07:00
Daniel Bachler
c32340662c Remove print statement 2018-03-28 12:28:58 +02:00
Syrus Akbary
9cdd95c114
Removed deprecated AbstractType from tutorial 2018-03-21 21:35:49 -07:00
Syrus Akbary
fdb7d5a253
Merge pull request #395 from mbarrientos/drf-list-serializers
Fixes #371 - Support ListSerializer fields in SerializerMutation
2018-03-14 23:31:10 -07:00
Syrus Akbary
8151fe75b8
Merge pull request #406 from gabriel-sevecek/master
Fix context-dependent filtering example in docs
2018-03-14 23:28:07 -07:00
Syrus Akbary
e9a40f2ae9
Merge pull request #403 from eyal0803/patch-2
Update authorization.rst
2018-03-14 23:27:43 -07:00
Syrus Akbary
134d6c6d32
Updated docs template 2018-03-13 22:38:17 -07:00
Syrus Akbary
34ddc6ce85
Merge pull request #401 from eyal0803/patch-1
Fixes #400
2018-02-28 20:36:55 -08:00
Daniel Bachler
34f5978446 Move distinct check code to merge_querysets again 2018-02-28 17:52:27 +01:00
Daniel Bachler
4d41160379 Update resolve method signature to 2.0 style in new test 2018-02-28 17:45:25 +01:00
Daniel Bachler
e05fbcc1b3 Fix failing unit test by handling cases where a connection is resolved involving a query with inner join and distinct that is then filtered and would be combined with a filtered queryset that is not distinct. 2018-02-28 14:41:47 +01:00
Daniel Bachler
23eb8eea80 Add failing test case 2018-02-28 14:41:47 +01:00
Gabriel Sevecek
bc713f22cb
Update filtering.rst 2018-02-27 11:29:34 +01:00
eyal0803
d98d2a6a73
Update authorization.rst
Someone probably forgot to change `CategoryNode`, from the previous tutorial, to `PostNode`.
2018-02-23 20:59:19 +02: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)) in Django's source that refers to an attribute named `remote_field`, instead of `rel`.

It seamed to fix the problem for me without any other bugs (yet).
2018-02-22 05:45:40 +02:00
mbarrientos
3793ce17c0 Add support for ListSerializer fields in SerializerMutation 2018-02-13 12:12:50 +01:00
Syrus Akbary
dbd3957a9f
Merge pull request #340 from urbandove/qfactor
Fix qfactor rankings for HTTP-ACCEPT
2018-02-11 14:01:18 -08:00
Syrus Akbary
5b17e98217
Merge pull request #356 from jkimbo/upgrade-graphiql
Upgrade graphiql and react versions
2018-02-11 13:47:48 -08:00
Syrus Akbary
c0edb0c927
Merge pull request #373 from jm2242/proxy-model-support
Basic Proxy model support
2018-02-11 13:46:13 -08:00
Syrus Akbary
41f931c7a0
Merge pull request #394 from urbandove/master
Remove old test
2018-02-11 12:52:49 -08:00
=
12b022a49a Remove old test 2018-02-09 16:46:22 -05:00
Syrus Akbary
94ee97085f
Merge pull request #368 from sciyoshi/convert-date-time
Convert Date/Time/DateTime form fields to appropriate Graphene types
2018-02-08 12:15:00 -08:00
Syrus Akbary
adde400893
Merge pull request #335 from urbandove/master
models.DateField => graphene Date Scalar
2018-02-08 12:14:13 -08:00
Paul Bailey
91a99ee39c serializer update support 2018-02-06 13:37:28 -06:00
Syrus Akbary
c585982a1a
Merge pull request #382 from patrick91/patch-1
Improve ErrorType
2018-02-03 22:25:03 -08:00
Syrus Akbary
5a92330164
Merge pull request #359 from yothinix/master
Update example project document link
2018-02-03 22:23:20 -08:00
Jonathan Mares
bfcfccfc8d undo cascade changes 2018-02-03 22:51:25 -05:00
=
da3bb5eea8 Bump graphene-django version 2018-02-03 18:35:38 -05:00
=
1bf5da2a8d Remove commits related to django 2.0 support from pull request 2018-02-03 18:32:18 -05:00
Jonathan Mares
bc1d47efb5 fix a line break 2018-02-03 14:36:25 -05:00
Jonathan Mares
0b103417f9 on_delete param where needed due to django 2 requirements
added support for querying a model with objects that may be a proxy model, fixed and added tests

a few style changes
2018-02-03 11:10:04 -05:00