Commit Graph

236 Commits

Author SHA1 Message Date
Syrus Akbary
03f3fbef22 Merge pull request #86 from gamingexperience/fix/field-choices-collision
Avoids collisions in choices names conversion.
2017-01-14 18:30:07 -08:00
Tony Angerilli
e77962bb0a Merge pull request #1 from nickhudkins/recursive-nodes
Bring up to date with upstream master
2017-01-13 08:39:08 -08:00
Nick Hudkins
0200b3244c Merge branch 'master' into recursive-nodes 2017-01-13 10:16:13 -05:00
Pablo Chinea
89d0f0ca92 Handles multiple collisions with the same key. 2017-01-05 09:49:26 +00:00
Pablo Chinea
2c26774c62 Avoid collisions in choices names conversion. 2017-01-04 16:23:17 +00:00
Pablo Chinea
16a0d9ce58 Fixes identation in queries test file. 2016-12-30 12:27:45 +00:00
Pablo Chinea
b5a450cb6d Fixes nested node test when django-filter is not installed. 2016-12-30 09:57:50 +00:00
Pablo Chinea
dfb55cda6b Adds test for nested node filtering. 2016-12-30 09:34:59 +00:00
Pablo Chinea
b26f914b54 Fixes filtering in nested nodes. 2016-12-29 15:40:12 +00:00
Syrus Akbary
4246ceaa85 Updated version to 1.2.1 2016-12-16 00:27:33 -08:00
momamene
45542b6a93 Remove meaningless guard 2016-12-14 12:13:11 +00:00
momamene
8bb55ed79d Get name of reverse_fields from model.__dict__ 2016-12-14 08:13:46 +00:00
Syrus Akbary
94bab46a75 Merge pull request #70 from patrickhsanders/fix-broken-link
Fix broken link in cookbook example
2016-12-06 09:24:16 -08:00
Syrus Akbary
0c26e8f5aa Merge pull request #71 from tguillemot/master
Fix some mistakes in documentation
2016-12-06 09:23:52 -08:00
Thierry Guillemot
3f139da7ae Fix Post name attribute
The `PostNode` class uses as model Post which does not have any field `title`
2016-12-05 11:01:49 +01:00
Thierry Guillemot
85da376333 Fix the setup of the cookbook example
`ingredients` and `recipes` from [examples/cookbook](https://github.com/graphql-python/graphene-django/tree/master/examples/cookbook) are included in cookbook/cookbook. 
By following the tutorial `ingredients` and `recipes` are in `cookbook/`.

Two possibilities : 
1) There is a mistake in the doc and I can correct it by adding a `cd cookbook` (as done by the PR)
2) Correct the [examples/cookbook](https://github.com/graphql-python/graphene-django/tree/master/examples/cookbook).

Solution 1 is easier but  I prefer the solution 2 because it is closer of what is done in the [django tutorial](https://docs.djangoproject.com/en/1.10/intro/tutorial01/).
2016-12-05 10:59:06 +01:00
Patrick Sanders
b16cb69000 Fix broken link in cookbook schema 2016-12-03 11:08:25 -05:00
Syrus Akbary
22b33214a7 Fixed Cookbook. Fixed #68 2016-12-01 21:49:58 -08:00
Syrus Akbary
401af42a55 Merge pull request #66 from pizzapanther/master
added timefield support
2016-12-01 21:41:24 -08:00
Paul Bailey
0b76e1abac updated dependency 2016-11-28 14:25:41 -05:00
Paul Bailey
aa6edfc62c Merge remote-tracking branch 'upstream/master' 2016-11-28 12:55:20 -05:00
Paul Bailey
10699c0b6b added time field 2016-11-23 12:25:59 -05:00
Paul Bailey
402cd645e8 added time field test 2016-11-23 12:24:53 -05:00
Paul Bailey
509645d3bd added time field test 2016-11-23 12:07:40 -05:00
Paul Bailey
91365ff670 added timefield support 2016-11-23 11:29:04 -05:00
Syrus Akbary
c60c1430a7 Updated version to 1.2.0 2016-11-23 02:43:58 -08:00
Syrus Akbary
37f8464caa Merge pull request #65 from graphql-python/features/django-filter-1-0
Updated Django Filter integration to 1.0
2016-11-23 02:41:00 -08:00
Syrus Akbary
9d35b76697 Remove order_by in docs 2016-11-23 02:32:52 -08:00
Syrus Akbary
9216772315 Removed unused imports 2016-11-23 02:30:14 -08:00
Syrus Akbary
b3fbac5818 Fixed tests 2016-11-23 02:28:21 -08:00
Syrus Akbary
2e1f154441 Fixed travis build 2016-11-23 02:20:32 -08:00
Syrus Akbary
8dfe7bbcf5 Remove filter order_by as Django Filters have deprecated it in 1.0 2016-11-23 02:15:05 -08:00
Syrus Akbary
48993ddca0 Fixed order_by 2016-11-23 01:20:10 -08:00
Timothy Laurent
f88590343b create pytest.ini to contain DJANGO_SETTINGS_MODULE 2016-11-16 09:56:55 -08:00
Timothy J Laurent
297b741cdb Merge pull request #1 from graphql-python/master
Catch up with parent repo
2016-11-15 16:38:57 -08:00
Tony Angerilli
207f4ebb41 added a test and made the type property better 2016-11-14 23:44:50 -08:00
Syrus Akbary
d8567f1c58 Fixed JSONField import only in Django 1.9+. Fixed #40 2016-11-14 23:07:45 -08:00
Syrus Akbary
96236408c5 Fixed lint issue 2016-11-14 22:34:49 -08:00
Syrus Akbary
cf27318e3c Updated version to 1.1.0 2016-11-14 22:33:58 -08:00
Syrus Akbary
8749f5a6d8 Updated travis to auto-upload PyPI versions. Fixed #41 2016-11-14 22:32:41 -08:00
Syrus Akbary
5289cd06d7 Improved choice Enum converter 2016-11-14 22:30:20 -08:00
Syrus Akbary
854aa4aa9b Fixed tests 2016-11-14 22:30:20 -08:00
Tony Angerilli
dc6e8f110a fix typo 2016-11-14 10:40:47 -08:00
Tony Angerilli
73f4a92b4f Merge branch 'master' into recursive-nodes 2016-11-14 00:32:56 -08:00
Syrus Akbary
31fdb5a34c Merge pull request #51 from chaffeqa/patch-1
Fix missing operation_name warning
2016-11-13 21:26:56 -08:00
Syrus Akbary
d5951b8477 Merge pull request #54 from dukebody/add-pytest-runner
Add `pytest-runner` and test-->pytest alias to make tests run as documented
2016-11-13 21:26:39 -08:00
Syrus Akbary
1e7c7ac34f Merge pull request #55 from dukebody/docs-build-instructions
Add docs about how to build docs, and add sphinx as docs requirement.
2016-11-13 19:21:02 -08:00
Syrus Akbary
dd07cb1f6c Merge pull request #56 from dukebody/graphqlview-schema-explicit
Explain alternative way to specify schema in tutorial.
2016-11-13 19:20:42 -08:00
Israel Saeta Pérez
e72f6b2610 Explain alternative way to specify schema in tutorial. 2016-11-12 20:08:01 +01:00
Israel Saeta Pérez
d84c651bb4 Add docs about how to build docs, and add sphinx as docs requirement. 2016-11-12 19:47:44 +01:00