Commit graph

182 commits

Author SHA1 Message Date
nnance
e03f64db72 Merge branch 'master' of github.com:apollostack/apollo-server into apollo-hapi
# Conflicts:
#	src/integrations/integrations.test.ts
2016-07-18 21:06:00 -07:00
Nick Nance
f2bc41c392 Merge pull request #50 from apollostack/add-context
Add context support to Express
2016-07-18 21:00:42 -07:00
Nick Nance
9667b5f971 add support for context 2016-07-17 17:55:21 -07:00
Nick Nance
6633e52265 add context test 2016-07-17 17:51:41 -07:00
nnance
f9bc7dec8d refactored server handler 2016-07-16 07:31:14 -07:00
nnance
6b6fcba2d2 all hapi tests passing 2016-07-16 07:12:08 -07:00
Nick Nance
52a1faeefe Merge branch 'master' of github.com:apollostack/apollo-server into apollo-hapi 2016-07-16 06:35:26 -07:00
Nick Nance
9cb004c5e3 add support for format params function 2016-07-07 22:54:46 -07:00
Nick Nance
9b20769267 add check for missing post body 2016-07-07 22:47:05 -07:00
Nick Nance
a19b9830b4 added support for options as a promise 2016-07-07 22:36:44 -07:00
Jonas Helfer
8a49a8bb66 Merge pull request #45 from apollostack/design-docs
Design docs + roadmap
2016-07-07 19:02:52 -07:00
Jonas Helfer
307e80c517 add contributing.md 2016-07-07 17:54:01 -07:00
Nick Nance
8a3e2fdf4a allow each integration suite to be ran separately 2016-07-07 08:46:10 -07:00
Nick Nance
53cc130e51 some working integration tests 2016-07-07 06:35:48 -07:00
Nick Nance
05347ffe03 add test suite integration parameter 2016-07-07 06:35:20 -07:00
Nick Nance
033495ed1b Merge branch 'master' of github.com:apollostack/apollo-server into apollo-hapi
# Conflicts:
#	src/index.ts
2016-07-06 22:35:25 -07:00
Jonas Helfer
57d804cb68 add GraphQL subscriptions to roadmap 2016-07-06 20:08:24 -07:00
Jonas Helfer
9200b707a6 Write ROADMAP.md with designs 2016-07-06 19:57:11 -07:00
Jonas Helfer
36f76c847c fix typo in DESIGN.md 2016-07-06 17:17:30 -07:00
Nick Nance
ba9a9a837d rename api (#44)
* rename api

* change express api name
2016-07-06 11:45:20 -07:00
Nick Nance
3a39e96f20 improve hapi api 2016-07-06 07:05:59 -07:00
Nick Nance
0e1c06ef57 update public api 2016-07-05 18:32:46 -07:00
Nick Nance
e1b1c9b1a2 initial working version of hapi 2016-07-05 17:25:18 -07:00
Jonas Helfer
2cb9e52e6d initial design document for apollo server (#19)
* initial design document for apollo server

* update DESIGN.md to clarify some things
2016-07-05 15:14:21 -07:00
Jonas Helfer
c8a75f0a54 add PR template 2016-07-05 15:13:38 -07:00
Jonas Helfer
34b3f4ed52 update changelog 2016-07-05 15:12:24 -07:00
Jonas Helfer
61b9a091a1 fix npm version number 2016-07-05 15:03:46 -07:00
Jonas Helfer
07495a163e cherry-pick changes from master 2016-07-05 15:01:49 -07:00
Jonas Helfer
658a15059a 0.4.0 2016-07-05 14:25:08 -07:00
Jonas Helfer
b95ec16aaf lint 2016-07-05 14:19:55 -07:00
Jonas Helfer
68bba72ff8 add try/catch and test for rejected options 2016-07-05 14:19:14 -07:00
Jonas Helfer
782cb20864 clarify when validationRules are applied 2016-07-05 14:10:42 -07:00
Jonas Helfer
8a99ed6f33 add support for extra validation rules 2016-07-05 14:10:27 -07:00
Nick Nance
c7a9642ee4 make integration tests completely generic 2016-07-04 22:04:31 -07:00
Nick Nance
7d2eca3b96 create common apolloOptions module 2016-07-04 22:03:59 -07:00
Nick Nance
b374d42270 initial separation of integration tests 2016-07-03 08:42:59 -07:00
Nick Nance
f6725935f0 merge branch "core-refactor" 2016-07-02 07:38:26 -07:00
Nick Nance
e9588c0a0f add missing babel dependency 2016-07-01 16:17:31 -07:00
Nick Nance
47da4f6d2b fix tests and coverage for node 6 2016-07-01 16:12:58 -07:00
Nick Nance
f1f861076c fix coverage tool for es6 with babel 2016-07-01 15:15:02 -07:00
Nick Nance
b51b1e3979 attempt to fix travis errors 2016-07-01 11:38:53 -07:00
Nick Nance
6f566e04c7 refactor express app out of each test 2016-07-01 09:16:17 -07:00
Nick Nance
443f9b8cba remove unneeded promise import, we are using es6 2016-07-01 08:51:16 -07:00
Nick Nance
e32b202881 remove query check as to fix graphiql integration 2016-06-30 10:10:25 -07:00
Nick Nance
00c2626ce0 fix graphiql endpointURL in rendering 2016-06-30 09:25:31 -07:00
Nick Nance
321847ee57 updated express example usage to include graphiql 2016-06-30 08:53:51 -07:00
Nick Nance
fcbe57b061 Merge branch 'core-refactor' of github.com:apollostack/apollo-server into core-refactor 2016-06-29 22:40:23 -07:00
Jonas Helfer
592bd027b5 add comments for parameters to expressApollo 2016-06-29 15:42:32 -04:00
Jonas Helfer
4b8254a5dd duplicate GraphiQLData comment in apolloServer 2016-06-29 15:33:24 -04:00
Jonas Helfer
5f4b5756b5 add comment about GraphiQL params 2016-06-29 15:30:47 -04:00