Commit Graph

363 Commits

Author SHA1 Message Date
mongkok
b81e961c86 Test DjangoObjectType with custom meta #364 2018-02-03 03:16:58 +05:30
mongkok
167d0a3964 Allow DjangoObjectType to have default _meta 2018-01-22 01:03:52 +05:30
Syrus Akbary
e05f069b3b
Merge pull request #377 from faassen/patch-1
Adjustments to make it work with Django 2.0.1
2018-01-20 16:17:47 -08:00
Syrus Akbary
961404f397
Merge pull request #339 from urbandove/rm-django1.7
Remove Django1.7 shims
2018-01-20 16:17:21 -08:00
Martijn Faassen
ea4ddc7f79
Adjustments to make it work with Django 2.0.1
I tried the tutorial but ran into these two problems in Django 2.0.1.
2018-01-18 16:46:08 +01:00
=
f31db13cd0 Add blank line for linting 2017-12-18 12:02:04 -05:00
=
6e1d340c87 Merge branch 'master' of git://github.com/graphql-python/graphene-django into rm-django1.7 2017-12-18 12:00:18 -05:00
Syrus Akbary
b54e02c9ba
Merge pull request #338 from spockNinja/fix_tests
Fixing the test build
2017-12-17 16:04:27 -08:00
=
d2db5f5584 Remove Django1.7 shims 2017-12-10 00:53:13 -05:00
=
f8a5860f34 django version depends on python version 2017-12-09 14:24:48 -08:00
Syrus Akbary
24706f50d4
Merge pull request #332 from MichaelDanielTom/MichaelDanielTom-patch-1
Readme typo fix
2017-11-29 22:06:26 -08:00
Michael Tom
3aeee3af3d
Update README.rst 2017-11-28 21:04:08 -05:00
Michael Tom
8a3ba7a321
Update README.md 2017-11-28 21:02:53 -05:00
Syrus Akbary
c63dbea34b
Merge pull request #330 from pjdelport/patch-1
README: Update resolve_users() example signature
2017-11-25 12:06:48 -08:00
Syrus Akbary
d8a4b4a0fd
Update README.md 2017-11-22 13:47:18 -08:00
Pi Delport
90d84e8be9
README: Update resolve_users() example signature 2017-11-21 15:10:52 +02:00
Syrus Akbary
d7c160c3b0
Pin current Graphene-Django version to Graphene~2
To avoid compatibility issues it's better to pin dependencies.
2017-11-20 21:02:00 -08:00
Syrus Akbary
31679df08c
Merge pull request #328 from SpaceK33z/patch-1
Docs: fix usage of deprecated `AbstractType`
2017-11-20 20:54:07 -08:00
Kees Kluskens
70a6c72751
Docs: fix usage of deprecated AbstractType
A tutorial still used `graphene.AbstractType` instead of `object`, which leads to a [deprecation warning](https://github.com/graphql-python/graphene/blob/master/UPGRADE-v2.0.md#abstracttype-deprecated).
2017-11-18 22:10:39 +01:00
Syrus Akbary
5661db88d1
Merge pull request #156 from aaxelb/master
Fix #87: Don't create duplicate Enums for fields with choices
2017-11-14 21:14:51 -08:00
Syrus Akbary
14dca8297d
Merge pull request #278 from devbis/patch-1
Access to batch endpoint without parameters fixed
2017-11-14 21:09:37 -08:00
Syrus Akbary
5a546689b9
Merge branch 'master' into patch-1 2017-11-14 21:06:05 -08:00
Syrus Akbary
670437d756
Merge branch 'master' into patch-1 2017-11-14 21:05:47 -08:00
Syrus Akbary
b19308b1c2
Merge pull request #323 from pizzapanther/master
fixes #322, fixed incorrect serializer instance usage
2017-11-14 20:40:03 -08:00
Paul Bailey
6cfd5b2854 added line ending 2017-11-14 22:10:26 +00:00
Paul Bailey
0a660e5e56 Merge remote-tracking branch 'upstream/master' 2017-11-14 22:04:02 +00: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
Syrus Akbary
c5774a93fe
Merge pull request #324 from sciyoshi/patch-1
Fix passing request context to filterset creation
2017-11-14 13:15:49 -08:00
Paul Bailey
345fe877c4 added ModelSerializer tests 2017-11-13 20:35:00 +00:00
Paul Bailey
c72e7e55eb added ModelSerializer tests 2017-11-13 20:33:12 +00: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
Paul Bailey
3d30038795 Merge remote-tracking branch 'upstream/master' 2017-11-13 16:10:56 +00:00
Paul Bailey
75e11a8195 add created field to test 2017-11-13 16:06:07 +00: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
9e26aaf6ad
Merge pull request #224 from camd/fix-select-related
Fix select_related with filtering
2017-11-13 02:36:45 -08:00
Syrus Akbary
95e28ba3ef
Merge branch 'master' into fix-select-related 2017-11-13 02:33:07 -08:00
Syrus Akbary
b8fb64d893
Merge branch 'master' into fix-select-related 2017-11-13 02:31:15 -08:00
Syrus Akbary
dfa0a06cce
Merge pull request #266 from miguel550/master
Fix code example typos in "Getting single objects" from tutorial-plain.rst
2017-11-13 02:29:00 -08:00
Syrus Akbary
94e2a5c49f
Merge pull request #313 from BossGrand/feature/allow_abstract_connections
Allow DjangoObjectType to use an Abstract Connection Class
2017-11-13 02:23:46 -08:00
Syrus Akbary
e666d849be
Merge pull request #315 from BossGrand/fix/django_filter_connection_field_merge_queries
Fix Bug causing DjangoFilterConnectionField to ignore annotations, .reverse()
2017-11-13 02:22:23 -08:00
Paul Bailey
e05f41af40 fixed indentation 2017-11-12 23:10:29 +00:00
Syrus Akbary
ec2cea1afa
Merge pull request #311 from tervay/typo-fixes
Fix documentation typos
2017-11-12 10:26:16 -08:00
Syrus Akbary
bc15439e3d
Merge pull request #316 from mekhami/patch-1
Update README to reflect that resolve_only_args is deprecated
2017-11-12 10:25:42 -08:00
Syrus Akbary
f0f117663c
Merge pull request #306 from vpoulailleau/patch-1
typo in authorization.rst
2017-11-12 10:25:24 -08:00
Paul Bailey
e7391937dd fixes #322, fixed incorrect serializer instance usage 2017-11-10 21:49:48 +00:00
mekhami
a3f3d90ab7
Update README to reflect that resolve_only_args is deprecated
As resolve_only_args is deprecated, let's remove it from the README.
2017-11-04 12:29:58 -05: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