Grzegorz Leoniec
c96e22492c
merged tags and categories in
2018-12-08 13:44:22 +01:00
Robert Schäfer
ef816b2d10
Wrong network name in Nitro-Backend
2018-12-08 13:37:42 +01:00
Robert Schäfer
ad66dd1b85
Give hc-network a name
...
I was wrong. It's not the container name but I forgot simply to give the
network the very same name as specified in the docker-compose.yml of the
frontend
2018-12-08 13:33:38 +01:00
Robert Schäfer
bc5d75261b
Wire frontend and backend together
2018-12-08 13:26:28 +01:00
Robert Schäfer
d7b9dc1b23
No need to call xip.io anymore
...
After https://github.com/Human-Connection/Nitro-Backend/pull/61
the xip.io URL has become obsolete
2018-12-08 13:23:49 +01:00
Robert Schäfer
b4c92ec29a
Remove xip.io hack
...
After we proxy API requests through the server-side-rendered frontend
there is no need to use xip.io anymore. However, if you "join" services
to a named network at arbitrary times, the DNS of docker-compose only
works if you assign a name to the container. Thus I left `backend` as a
container name.
2018-12-08 13:17:43 +01:00
Robert Schäfer
0abdb80b00
Update Nitro-Web so cypress can find email input
2018-12-08 12:54:04 +01:00
Robert Schäfer
1fb8db2972
Bind name to name instead of model
...
Apparently this slipped through somehow in
https://github.com/Human-Connection/Nitro-Web/pull/13
2018-12-08 12:46:51 +01:00
Robert Schäfer
4b8ac0836c
Revert "Maybe localhost is not available on Travis CI?"
...
This reverts commit cb215b850a2d0e6d9a713a16855f765e8273c9e5.
2018-12-08 12:08:27 +01:00
Robert Schäfer
287aa96a3f
Don't update submodules
2018-12-08 11:55:34 +01:00
Robert Schäfer
6ce9406188
And run seed data on Travis CI
2018-12-08 11:48:34 +01:00
Robert Schäfer
d2cde2154f
Update submodules
...
Backend is now on a commit that has npm-run-all which allows to run seed
data in docker-compose.
2018-12-08 11:46:51 +01:00
Robert Schäfer
266072bcc9
Wait for http connection instead of tcp
2018-12-08 02:32:46 +01:00
Robert Schäfer
d801e679e6
Current dir relative to first docker-compose.yml
2018-12-08 02:19:22 +01:00
Robert Schäfer
46080fff98
Fix build
2018-12-08 01:58:51 +01:00
Robert Schäfer
61e1a474a8
Merge all docker-compose files
2018-12-08 01:56:54 +01:00
Robert Schäfer
8ce9dedc06
Remove one & to increase build time?
2018-12-08 01:54:23 +01:00
Robert Schäfer
cb215b850a
Maybe localhost is not available on Travis CI?
2018-12-08 01:51:25 +01:00
Robert Schäfer
9b4279c162
Wait on port 3000
2018-12-08 01:39:55 +01:00
Robert Schäfer
d9a7079392
Run seeds and lint in docker-compose
2018-12-08 01:26:13 +01:00
Robert Schäfer
1d92f0ad24
Replace concurrently with npm-run-all
...
Package npm-run-all is specialized on npm scripts and does not hang with
docker-compose.
2018-12-08 01:22:35 +01:00
Robert Schäfer
e1137bd03f
Again one level up
2018-12-08 00:47:58 +01:00
Robert Schäfer
ce07ece4d6
Go back the directory tree
2018-12-08 00:29:39 +01:00
Robert Schäfer
255f563206
Ok, don't run neo4j to keep port 7687 up
2018-12-08 00:22:39 +01:00
Robert Schäfer
fa617955d3
Up the containers and send to background
2018-12-08 00:19:42 +01:00
Grzegorz Leoniec
80bc9be9ab
pinned and updated package for more stable installs
2018-12-07 20:53:41 +01:00
Grzegorz Leoniec
ceca6477b2
added graphql 0.13.0 as its a needed peer dependency
2018-12-07 20:42:37 +01:00
Grzegorz Leoniec
c5a0a68d5f
merged master in
2018-12-07 20:35:43 +01:00
Grzegorz Leoniec
0ca5b0923a
ignoring .nyc_output
2018-12-07 20:30:50 +01:00
Grzegorz Leoniec
034fea3f47
fixing console log issues
2018-12-07 20:30:40 +01:00
Grzegorz Leoniec
e22f950c48
use mocha from bin
2018-12-07 20:27:29 +01:00
Grzegorz Leoniec
26d55043ed
added testing coverage and codecov config
2018-12-07 20:24:52 +01:00
Grzegorz Leoniec
e2c6305f21
fixing linting issues
2018-12-07 19:42:57 +01:00
Grzegorz Leoniec
572e5005d0
Merge remote-tracking branch 'origin/master' into locations
2018-12-07 19:30:11 +01:00
Grzegorz Leoniec
987fa33d58
fixed linting issues
2018-12-07 19:29:37 +01:00
Grzegorz Leoniec
d70042cd22
merged master in
2018-12-07 17:38:18 +01:00
Grzegorz Leoniec
165d41c413
Merge pull request #75 from Human-Connection/upgrade-styleguide
...
Upgraded Styleguide
2018-12-07 17:31:12 +01:00
Grzegorz Leoniec
ff82035555
format styleguide config files
2018-12-07 17:20:40 +01:00
Grzegorz Leoniec
32dd2e4d4b
fixed whitespace
2018-12-07 16:11:30 +01:00
Grzegorz Leoniec
2ef13980a6
upgrade styleguide the second
2018-12-07 16:09:23 +01:00
Grzegorz Leoniec
ae96b95798
merged master in
2018-12-07 15:37:00 +01:00
Grzegorz Leoniec
0440d06e54
Merge remote-tracking branch 'origin/master' into upgrade-styleguide
2018-12-07 15:33:03 +01:00
Grzegorz Leoniec
53a45a38e2
upgraded partial of styleguide
2018-12-07 15:21:42 +01:00
Grzegorz Leoniec
37d771cf57
Merge pull request #57 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.0.1
...
Bump neo4j-graphql-js from 2.0.0 to 2.0.1
2018-12-07 09:09:33 +01:00
dependabot[bot]
6dac30b820
Bump neo4j-graphql-js from 2.0.0 to 2.0.1
...
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases )
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-07 04:25:58 +00:00
Grzegorz Leoniec
edaf129b5f
Merge pull request #26 from Human-Connection/dependabot/docker/neo4j-3.5.0
...
Bump neo4j from 3.4 to 3.5.0
2018-12-06 19:24:24 +01:00
Grzegorz Leoniec
a308a18690
Merge branch 'master' into dependabot/docker/neo4j-3.5.0
2018-12-06 19:24:13 +01:00
Grzegorz Leoniec
6f6eb1e024
Merge branch 'master' into dependabot/docker/neo4j-3.5.0
2018-12-06 19:23:43 +01:00
Grzegorz Leoniec
4105fe1149
Merge pull request #42 from Human-Connection/tagged_deployments
...
Tagged deployments
2018-12-06 19:20:56 +01:00
Grzegorz Leoniec
11d18c2895
Merge branch 'master' into tagged_deployments
2018-12-06 19:20:38 +01:00
