Commit Graph

335 Commits

Author SHA1 Message Date
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
Justin Tervay
bbcd69967c
Fix typos 2017-11-01 13:56:28 -07:00
Charles Haro
2a39f5d8ea Allow abstract Connection Class to DjangoObjectType
referred to as connection_class, it will instantiate the connection from the provided class or default to graphene.Connection if not supplied
2017-10-30 14:35:29 -07:00
Vincent Poulailleau
00b5a176d3
typo in authorization.rst
fix a small typo error in the documentation
2017-10-30 09:54:09 +01:00
Syrus Akbary
2600f0f041 Point to stable version of Graphene 2.0 2017-10-26 00:21:11 -07:00
Syrus Akbary
5051d3bb61 Fixed lint 2017-10-25 10:54:13 -07:00
Syrus Akbary
de3947351b Updated graphene-django to 2.0 🎉 2017-10-25 10:49:37 -07:00
Jacob
1d76db8164 Use super for base queryset logic 2017-10-14 13:23:08 -05:00
Cameron Dawson
69cec060d8 Fix select_related with filtering 2017-10-14 13:23:08 -05:00
Syrus Akbary
283bccf9d3 Merge pull request #287 from spockNinja/fix_master_failing_test
Fix failing master test
2017-10-11 00:03:17 +02:00
Jacob
768fca668d Trying conditional build install override 2017-10-10 00:09:28 -05:00
Jacob
886d909a9a Pin drf to < 3.7, fixes failing tests 2017-10-09 23:47:21 -05:00
Syrus Akbary
77f036157b Merge pull request #279 from nikolas/patch-1
intro tutorial: setup -> set up
2017-10-09 13:21:34 +02:00
Syrus Akbary
31085d8d7b Merge pull request #283 from TheBlusky/patch-1
Update authorization.rst
2017-10-09 13:19:55 +02:00
Dan Lousqui
9c9cef4ea9 Update authorization.rst
Upgrading doc, as suggested in https://github.com/graphql-python/graphene-django/issues/282
2017-10-08 14:42:34 +02:00
Nik Nyby
04fc5a0305 intro tutorial: setup -> set up
"setup" is a noun, while "set up" is a verb. I've updated the usage here.
2017-10-04 23:13:00 -04:00
Miguel
73905547c8 Fix tutorial-plain.rst typo in " Getting single objects" code example 2017-09-09 15:21:34 -04:00
Syrus Akbary
f35e445963 Merge pull request #263 from jeremytiki/tutorial-update-graphene-2.0.dev
Issue #262 fix
2017-09-07 01:24:17 -07:00
Jeremy Spencer
84d063261e Updated tutorial-plain to be in line with breaking changes in graphen-python>=2.0.dev: https://github.com/graphql-python/graphene/blob/master/UPGRADE-v2.0.md\#simpler-resolvers 2017-09-04 08:04:10 -04:00
Syrus Akbary
0e28ccc30a Updated versions in readme 2017-09-01 01:25:41 -07:00
Syrus Akbary
55f9d72ecc Updated dev version 2017-09-01 01:19:22 -07:00
Syrus Akbary
f93251bcbb Removed pypy from travis 2017-09-01 01:12:32 -07:00
Syrus Akbary
2a73e5e479 Fixed flake 2017-09-01 00:52:57 -07:00
Syrus Akbary
728bcacb0e Merge pull request #261 from q3aiml/fix-serializermutation-regression
fix various SerializerMutation regressions
2017-09-01 00:47:34 -07:00
Syrus Akbary
992fbf0c44 Merge pull request #245 from edmorley/fix-deprecation-warnings
Remove usages of deprecated field.rel
2017-09-01 00:46:21 -07:00
Syrus Akbary
ec5dba35b3 Merge pull request #260 from ovidner/master
Removed duplicate bdist_wheel section
2017-09-01 00:39:52 -07:00