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

237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
75bb73a5f8
Merge pull request #59 from Human-Connection/ci-improvements 
CI Improvements
 2018-12-13 15:57:37 +01:00
Grzegorz Leoniec
e1bbf67c5b
Merge branch 'master' into ci-improvements 2018-12-13 15:49:47 +01:00
Robert Schäfer
574073884b
Merge pull request #62 from Human-Connection/admin-tags-and-categories 
Admin tags and categories
 2018-12-13 13:18:14 +01:00
Robert Schäfer
00552c15af Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-13 10:59:05 +01:00
Robert Schäfer
766be0bb80
Merge pull request #66 from Human-Connection/run_full_stack_tests 
Docker ignore scripts folder, bash compatibility
 2018-12-12 16:34:46 +01:00
Robert Schäfer
a0c831fb81
Merge branch 'master' into run_full_stack_tests 2018-12-12 16:33:56 +01:00
Robert Schäfer
66f7265b15 Remove the script to trigger full stack tests 
This will be handled by the frontend repo
 2018-12-12 16:32:50 +01:00
Grzegorz Leoniec
794d8361d5
merged master in 2018-12-12 16:30:08 +01:00
Grzegorz Leoniec
755e54f303
Merge pull request #63 from Human-Connection/dependabot/npm_and_yarn/eslint-5.10.0 
Bump eslint from 5.9.0 to 5.10.0
 2018-12-12 16:16:13 +01:00
Grzegorz Leoniec
0d7a7e2ca7
Merge pull request #71 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.0.0-alpha.26 
Bump date-fns from 2.0.0-alpha.25 to 2.0.0-alpha.26
 2018-12-12 16:15:42 +01:00
Grzegorz Leoniec
4a50e40864
Merge pull request #67 from Human-Connection/dependabot/npm_and_yarn/slug-0.9.3 
Bump slug from 0.9.2 to 0.9.3
 2018-12-12 16:15:28 +01:00
Grzegorz Leoniec
dc8fb8b38c
Merge pull request #69 from Human-Connection/dependabot/npm_and_yarn/nodemon-1.18.8 
Bump nodemon from 1.18.7 to 1.18.8
 2018-12-12 14:04:09 +01:00
Grzegorz Leoniec
6f1b46a2ca
Merge pull request #68 from Human-Connection/dependabot/npm_and_yarn/graphql-shield-4.1.2 
Bump graphql-shield from 4.1.1 to 4.1.2
 2018-12-12 14:03:36 +01:00
dependabot[bot]
0fd65793da
Bump date-fns from 2.0.0-alpha.25 to 2.0.0-alpha.26 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.25 to 2.0.0-alpha.26.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.25...v2.0.0-alpha.26)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-12 04:35:55 +00:00
Robert Schäfer
c0deb83f24 Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-12 01:47:51 +01:00
Grzegorz Leoniec
0d396712bd
downgrade graphql-middleware 2018-12-11 11:37:53 +01:00
dependabot[bot]
91f60439f4
Bump nodemon from 1.18.7 to 1.18.8 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.7 to 1.18.8.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.7...v1.18.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:26:24 +00:00
dependabot[bot]
9cee0e7883
Bump graphql-shield from 4.1.1 to 4.1.2 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v4.1.1...v4.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:26:07 +00:00
dependabot[bot]
35e7fd0cca
Bump slug from 0.9.2 to 0.9.3 
Bumps [slug](https://github.com/Trott/node-slug) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Commits](https://github.com/Trott/node-slug/compare/q0.9.2...v0.9.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:25:55 +00:00
Robert Schäfer
bd26f738a5 Same as this commit: 
8b324fc8dd
 2018-12-10 17:42:12 +01:00
Robert Schäfer
4ba03d1881 Trigger a build in our meta repository 
For full stack testing.
 2018-12-10 15:44:09 +01:00
Grzegorz Leoniec
afa143a627
added missing nyc dependency 2018-12-10 12:41:19 +01:00
dependabot[bot]
499c6851a7
Bump eslint from 5.9.0 to 5.10.0 
Bumps [eslint](https://github.com/eslint/eslint) from 5.9.0 to 5.10.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.9.0...v5.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 11:35:16 +00:00
Grzegorz Leoniec
d5755569a0
Merge branch 'master' into ci-improvements 2018-12-10 12:33:03 +01:00
Grzegorz Leoniec
bed0f819ff
Merge pull request #21 from Human-Connection/mochajs 
Setup integration testing with MochaJS
 2018-12-10 12:32:38 +01:00
Grzegorz Leoniec
faca6069ab
meged mochajs in 2018-12-09 18:40:25 +01:00
Grzegorz Leoniec
1823223281
merged master in 2018-12-09 18:38:58 +01:00
Grzegorz Leoniec
99a9d51596
Merge pull request #61 from Human-Connection/remove_xipio_hack 
Remove xip.io hack
 2018-12-08 14:44:08 +01:00
Grzegorz Leoniec
8f0407c706
merged master in 2018-12-08 14:41:57 +01:00
Grzegorz Leoniec
5a5f89e544
Merge branch 'ci-improvements' of github.com:appinteractive/hc-prototype-api into ci-improvements 2018-12-08 14:27:49 +01:00
Grzegorz Leoniec
141e1cc7fd
fix nyc testing on build 2018-12-08 14:27:46 +01:00
Grzegorz Leoniec
9bc9246bdc
Merge branch 'master' into remove_xipio_hack 2018-12-08 14:25:07 +01:00
Grzegorz Leoniec
3349c73862
Merge branch 'master' into ci-improvements 2018-12-08 14:22:24 +01:00
Grzegorz Leoniec
7e0aba23ec
Merge pull request #60 from Human-Connection/npm-run-all 
Replace concurrently with npm-run-all
 2018-12-08 14:22:05 +01:00
Grzegorz Leoniec
c4f7787796
merged npm-run-all in 2018-12-08 14:20:06 +01:00
Grzegorz Leoniec
f0c321700e
merged master in 2018-12-08 14:16:11 +01:00
Grzegorz Leoniec
fb7307caf1
improve tags and categories 2018-12-08 14:01:00 +01:00
Grzegorz Leoniec
f9f58313ed
Merge pull request #58 from Human-Connection/pin-dependencies 
[WIP] Pin dependencies
 2018-12-08 13:55:01 +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
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
46080fff98 Fix build 2018-12-08 01:58:51 +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
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