IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
340 Commits 5 Branches 2 Tags
Commit Graph

340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Grzegorz Leoniec
46f971c110
Merge pull request #51 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.0.0 
Bump neo4j-graphql-js from 1.0.5 to 2.0.0
 2018-12-06 19:20:18 +01:00
Grzegorz Leoniec
86346fa50c
Merge branch 'master' into dependabot/npm_and_yarn/neo4j-graphql-js-2.0.0 2018-12-06 19:19:55 +01:00
Robert Schäfer
988447a5b5
Merge pull request #56 from faithngetich/patch-3 
Add a missing discord link
 2018-12-06 17:30:44 +01:00
dependabot[bot]
b84a48f981
Bump neo4j-graphql-js from 1.0.5 to 2.0.0 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 1.0.5 to 2.0.0.
- [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-06 16:26:10 +00:00
Robert Schäfer
40f42240c6
Merge pull request #54 from faithngetich/patch-1 
Use the right db seed name
 2018-12-06 17:23:02 +01:00
Grzegorz Leoniec
d94c9e9ff5
Merge pull request #53 from Human-Connection/dependabot/npm_and_yarn/sanitize-html-1.19.3 
Bump sanitize-html from 1.19.2 to 1.19.3
 2018-12-06 17:22:44 +01:00
faithngetich
3d65d09b3a
Add a missing discord link 2018-12-06 19:20:15 +03:00
faithngetich
fc2fca0317
Use the right db seed name 2018-12-06 19:12:29 +03:00
dependabot[bot]
0d9322f601
Bump sanitize-html from 1.19.2 to 1.19.3 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.19.2 to 1.19.3.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/compare/1.19.2...1.19.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 11:56:30 +00:00
Grzegorz Leoniec
4a8d3a67ad
Merge pull request #52 from Human-Connection/dependabot/npm_and_yarn/dotenv-6.2.0 
Bump dotenv from 6.1.0 to 6.2.0
 2018-12-06 12:52:21 +01:00
dependabot[bot]
c6cc461057
Bump dotenv from 6.1.0 to 6.2.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 04:48:26 +00:00
Robert Schäfer
03d7148958 Run the tests in the docker image 
Travis lags behind with the current version of docker-compose
 2018-12-05 00:37:18 +01:00
Grzegorz Leoniec
ee911b46f9
Merge branch 'master' into dependabot/docker/neo4j-3.5.0 2018-12-05 00:35:32 +01:00
Robert Schäfer
7df0a1bd97 Merge remote-tracking branch 'origin/master' into mochajs 2018-12-05 00:35:30 +01:00
Grzegorz Leoniec
32dec7bac6
Merge pull request #47 from Human-Connection/dependabot/npm_and_yarn/sanitize-html-1.19.2 
Bump sanitize-html from 1.19.1 to 1.19.2
 2018-12-05 00:34:44 +01:00
Robert Schäfer
ad62a8ebb3 Set unimplemented mocha tests to pending 2018-12-05 00:18:47 +01:00
Robert Schäfer
1ae09b5a7f Merge remote-tracking branch 'origin/master' into mochajs 2018-12-05 00:12:42 +01:00
dependabot[bot]
7623b4dc85
Bump sanitize-html from 1.19.1 to 1.19.2 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/compare/1.19.1...1.19.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 22:56:53 +00:00
Robert Schäfer
3ef98dab84 Merge remote-tracking branch 'origin/master' into tagged_deployments 2018-12-04 23:53:17 +01:00
Robert Schäfer
62e3ba9ff2
Merge pull request #40 from Human-Connection/use_docker_compose_on_travis_for_testing 
Run seeds and eslint on Travis CI
 2018-12-04 23:52:49 +01:00
Robert Schäfer
698b1bb218
Merge branch 'master' into use_docker_compose_on_travis_for_testing 2018-12-04 23:48:59 +01:00
Robert Schäfer
43b5d8eeb0 Follow @appinteractives review 
See:
https://github.com/Human-Connection/Nitro-Backend/pull/40#pullrequestreview-180898363
https://github.com/Human-Connection/Nitro-Backend/pull/40#pullrequestreview-180950115
 2018-12-04 23:43:19 +01:00
Robert Schäfer
f250c60fc9
Merge pull request #43 from Mastercuber/kubernetes-readme 
Add troubleshoot to kubernetes README
 2018-12-04 22:37:36 +01:00
Robert Schäfer
71c4ffb012 Merge remote-tracking branch 'origin/master' into mochajs 2018-12-04 21:35:45 +01:00
Armin Kunkel
d355974b6e Add troubleshoot to kubernetes README 2018-12-04 03:52:33 +01:00
Robert Schäfer
0fab314b13 Wording: Use reset-db for the file name, too 
FYI: @Mastercuber
 2018-12-04 01:20:50 +01:00
Robert Schäfer
8e462e9cc6 Typo: tagS to deploy only if git tag exists 2018-12-04 01:02:21 +01:00
Robert Schäfer
5eae8a8978 Configure Travis CI conditional builds 
and add placeholder deployment. This commit should deploy to

* `production` if on branch master AND tagged
* `staging` if on branch master
* `custom` if tagged

The custom deployment is inspired by https://zeit.co/now and should
deploy features for demonstration purposes before merging into master.

It will happen that we trigger multiple deployments with this workflow:
If we deploy to production, that is going to deploy to a custom
environment and to staging. But I think this is not too problematic.

What do you think @appinteractive @mcwimpy?
 2018-12-04 00:24:26 +01:00
Robert Schäfer
fa8cbba421 Copy .env.template for dummy secrets on Travis 2018-12-03 20:49:23 +01:00
Robert Schäfer
d201d73670 Run seeds without docker-compose 
I give up with running docker-compose on Travis CI. Using `bash` instead
of Linux alpine's `sh` does **not** fix the issue as suggested here:
https://github.com/kimmobrunfeldt/concurrently/issues/104
 2018-12-03 20:43:42 +01:00
Robert Schäfer
f1c3c6bede Wording: no-auth-server instead of backdoor 
Suggested by @appinteractive
 2018-12-03 20:43:16 +01:00
Robert Schäfer
d061348ec8 Use npm: prefixes to DRY package.json 
@appinteractive and @Mastercuber have a look, I guess this feature of
concurrently is new to you: https://www.npmjs.com/package/concurrently#usage

For some reason, concurrently hangs when run with docker-compose. I
haven't figured out how to fix this. Run locally, everything terminates
as expected.
 2018-12-03 19:28:42 +01:00
Robert Schäfer
298db35546 Use simple past and consistend naming 2018-12-03 19:04:45 +01:00
Robert Schäfer
a7b4b55b6c Follow up to @appinteractive's commit e2f7bc51 
Next time: `git grep "backend"` 👍
 2018-12-03 18:57:53 +01:00
Robert Schäfer
333f181161 Fix typo in .travis.yml 2018-12-03 18:31:46 +01:00
Robert Schäfer
2ace3e5ce8 Disable eslint for the always-true if-condition 
See: https://github.com/Human-Connection/Nitro-Backend/issues/41
 2018-12-03 18:28:34 +01:00
Robert Schäfer
f00dbb67df Re-add success notification on Discord 
Why was it disabled in the first place @appinteractive?
 2018-12-03 18:06:08 +01:00
Robert Schäfer
15d9178369 Install and configure eslint 
Fix all violations but one - there is a mock in our authentication.
 2018-12-03 18:05:28 +01:00
Robert Schäfer
0bfe880c21 Use docker-compose for testing on Travis CI 
Currently running
* seeds
* eslint
 2018-12-03 17:28:53 +01:00
Robert Schäfer
61d252177a
Merge pull request #15 from Mastercuber/unseed-db 
Add unseeder
 2018-12-03 17:20:32 +01:00