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

463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
acd1197ca1
Bump sanitize-html from 1.19.3 to 1.20.0 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.19.3 to 1.20.0.
- [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.3...1.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-18 04:20:24 +00:00
Grzegorz Leoniec
5f133a2d48
Merge pull request #81 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.9 
Bump apollo-link-http from 1.5.8 to 1.5.9
 2018-12-17 10:32:30 +01:00
Grzegorz Leoniec
082e305dbd
Merge pull request #78 from Human-Connection/dependabot/npm_and_yarn/nodemon-1.18.9 
Bump nodemon from 1.18.8 to 1.18.9
 2018-12-17 10:31:04 +01:00
dependabot[bot]
b8a89c9fac
Bump apollo-link-http from 1.5.8 to 1.5.9 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.8 to 1.5.9.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-17 04:41:28 +00:00
dependabot[bot]
cdda79fd2e
Bump nodemon from 1.18.8 to 1.18.9 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.8 to 1.18.9.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.8...v1.18.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-17 04:39:16 +00:00
Grzegorz Leoniec
a562578657
Merge branch 'master' into locations 2018-12-16 18:28:44 +01:00
Grzegorz Leoniec
1539d9ac91
Merge pull request #75 from Human-Connection/dependabot/npm_and_yarn/apollo-server-2.3.1 
Bump apollo-server from 2.2.6 to 2.3.1
 2018-12-16 18:27:42 +01:00
dependabot[bot]
f992a13632
Bump apollo-server from 2.2.6 to 2.3.1 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.2.6 to 2.3.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-16 17:17:38 +00:00
Grzegorz Leoniec
cf8ed1ceb3
Merge pull request #74 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.8 
Bump apollo-link-http from 1.5.7 to 1.5.8
 2018-12-16 18:12:38 +01:00
Grzegorz Leoniec
3fc7044676
moved npm-run-all and wait-on from dev to prod dependencies as they are needed for seeding 2018-12-15 13:40:17 +01:00
Grzegorz Leoniec
aed2a73d13
Merge pull request #72 from Human-Connection/multistage-build 
Reduce image size with multistage builds
 2018-12-15 11:18:14 +01:00
Robert Schäfer
779190f711 Run yarn run dev in development 2018-12-14 23:41:11 +01:00
Robert Schäfer
94eea091de Ensure stage builder is used for testing 
But avoid synced volumes, otherwise the deployment will crash because
Travis cannot clean up files just before entering the deployment.
 2018-12-14 23:25:52 +01:00
Robert Schäfer
4e816d9020 Fix (?) the build with an image tag for builder 
Also I added a base stage so we can have a common working directory.
 2018-12-14 23:10:48 +01:00
dependabot[bot]
6d0f69eb75
Bump apollo-link-http from 1.5.7 to 1.5.8 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.7 to 1.5.8.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-14 21:44:40 +00:00
Robert Schäfer
bef8aa1d6a Reduce docker image size with multistage build 
We don't need development dependencies in production. I also added the
BUILD_COMMIT environment variable to the image for convenience.
 2018-12-14 22:41:13 +01:00
Robert Schäfer
f9fec054d6
Merge pull request #70 from Human-Connection/production-build 
Build application for production without nodemon
 2018-12-14 22:39:03 +01:00
Robert Schäfer
9f78a96de2 Run babel node instead of nodemon 
Quote of @appinteractive:
```
Currently we are running nodemon on production which watches for filechanges and consumes much more memory then just node. As nodemon is only for development, I added a build step to compile the application for production and then only run the dist folder with pure node.
```
 2018-12-14 22:30:47 +01:00
Robert Schäfer
212725e44d Minor changes 2018-12-14 20:13:15 +01:00
Robert Schäfer
f2eca183cc Fix commit hash in deploy URL 
Executable deploy scripts
 2018-12-14 19:48:23 +01:00
Robert Schäfer
fca0a67bfd Don't user docker-compose.override.yml on Travis 
It creates volumes and these volumns will change ownership and linux
file permissions. That in turn will prevent Travis from removing those
files and eventually crash the deployment.
 2018-12-14 18:30:10 +01:00
Robert Schäfer
bdcadcb433 Update .dockerignore and .gitignore 2018-12-14 18:25:30 +01:00
Robert Schäfer
957bb4cea2
Add Travis build status to README 2018-12-14 18:24:12 +01:00
Robert Schäfer
3a15675e6c
Merge pull request #77 from Human-Connection/docker_push 
Use deployment script for docker images
 2018-12-14 18:18:30 +01:00
Robert Schäfer
2088d4e495 Use deployment script for docker images 
+Fix deprecation warning of docker login
 2018-12-14 18:16:34 +01:00
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
Grzegorz Leoniec
1f62e1d3f3
merged master in 2018-12-10 12:37:07 +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