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
5,888 Commits 5 Branches 2 Tags
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Grzegorz Leoniec
f128dc3701
Merge pull request #68 from Human-Connection/tagged_deployments 
Copy+paste deployment configuration from backend
 2018-12-06 16:37:54 +01:00
Grzegorz Leoniec
43ab84ee36
Merge branch 'master' into tagged_deployments 2018-12-06 16:37:30 +01:00
Grzegorz Leoniec
7bce96c171
Merge pull request #13 from Human-Connection/integration-testing 
Preparation for integration testing
 2018-12-06 16:35:36 +01:00
Robert Schäfer
e783acf97c Fix .yaml format 2018-12-06 16:00:51 +01:00
Robert Schäfer
54b92c465f Update docker-compose on Travis CI 2018-12-06 15:58:03 +01:00
Robert Schäfer
203ab4b0c5 Starting docker-containers in both repos 2018-12-06 15:53:42 +01:00
Robert Schäfer
3b807c5d05 Add missing cypress.json 2018-12-06 15:50:33 +01:00
Robert Schäfer
2d346448b3 Use https for submodules to avoid SSH key exchange 2018-12-06 15:44:35 +01:00
Robert Schäfer
0243bfbec2 Start with a .travis.yml and cypress run 
Build failures are expected
 2018-12-06 15:26:07 +01:00
Robert Schäfer
b0bd5b8174 Coyp over files from webapp repository 2018-12-06 15:24:49 +01:00
Robert Schäfer
364fa73cc2
Fix merge accident 2018-12-06 15:22:25 +01:00
Robert Schäfer
7aa2befc94 Remove cypress.json (forgot that) 2018-12-06 15:20:47 +01:00
Robert Schäfer
6415426949 Merge remote-tracking branch 'origin/master' into integration-testing 2018-12-06 15:18:12 +01:00
Robert Schäfer
38f27743f2 Remove remains of cypress 
I love cypress already. However my suggestion is to create a separate
repository that includes `backend` and `web` run full stack tests from
there. It is possible to trigger builds in other repositories on Travis
CI. So here is my suggestion: We agree to have matching branch names in
all related repositories, so `branch-1` in repo `web`, `backend` and
`human-connection`.

As a start, the developer has to manually update the submodules in the
meta repository and trigger a build to run fullstack tests. In the
future we might automate this process by triggering builds in other
repos. That's possible on Travis CI, see:
https://docs.travis-ci.com/user/triggering-builds/

See each repository is responsible to keep their set of unit/integration
tests but the meta repository is responsible of carrying out full stack
testing.

@appinteractive your opinion?
 2018-12-06 15:15:33 +01:00
Robert Schäfer
cf48aa86d7 Update API and WebApp submodules 2018-12-06 14:55:45 +01:00
Robert Schäfer
75076b7d5a Add Nitro-Web and Nitro-Backend as submodules 2018-12-06 14:54:39 +01: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
dependabot[bot]
d2d448f756
Merge pull request #70 from Human-Connection/dependabot/submodules/API-8ea42b5 2018-12-05 04:51:58 +00:00
dependabot[bot]
79d7b07765
Bump API from a64fff7 to 8ea42b5 
Bumps [API](https://github.com/Human-Connection/API) from `a64fff7` to `8ea42b5`.
- [Release notes](https://github.com/Human-Connection/API/releases)
- [Commits](a64fff79be...8ea42b5b40)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-05 04:51:32 +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