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
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
8f42a18729
Merge pull request #69 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-vue-5.0.0 
Bump eslint-plugin-vue from 4.7.1 to 5.0.0
 2018-12-04 23:17:40 +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
JB
56ed20f3bf Use kebab-case for components in templates 2018-12-04 22:02:15 +01:00
Robert Schäfer
71c4ffb012 Merge remote-tracking branch 'origin/master' into mochajs 2018-12-04 21:35:45 +01:00
Grzegorz Leoniec
34817378a4
Merge branch 'master' into locations 2018-12-04 21:32:54 +01:00
dependabot[bot]
05dcfab27a
Bump eslint-plugin-vue from 4.7.1 to 5.0.0 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 4.7.1 to 5.0.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v4.7.1...v5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 04:36:22 +00: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
eb29311cbb Copy+paste deployment configuration from backend 
See these commits:
5eae8a89785798519aec66fb708389f6e5ea0327
1b8edc22ff8b900c45486b815a8c9d4465e7edb7
 2018-12-04 01:01:28 +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
Robert Schäfer
66b12f28b8
Wording: unseed does not exist but clean 2018-12-03 17:16:41 +01:00
Armin Kunkel
b5ce0351c7 Add yarn db:reset script 2018-12-03 15:38:08 +01:00
Grzegorz Leoniec
ba312ac5e0 vue-izitoast@1.1.2 2018-12-03 12:13:00 +01:00
Grzegorz Leoniec
20fcac8567
Merge pull request #64 from Human-Connection/adapt-styleguide-docs 
adapt docs to styleguide integration
 2018-11-30 15:45:24 +01:00
mediadivision
536defa1a4 Merge remote-tracking branch 'origin/adapt-styleguide-docs' into adapt-styleguide-docs 2018-11-30 15:06:32 +01:00
mediadivision
4ba0e82b71 adapt docs to styleguide integration 2018-11-30 15:06:21 +01:00
Grzegorz Leoniec
8a79b4f7f7
Update Dockerfile.neo4j 
using correct APOC version matching Neo4J
 2018-11-30 14:41:56 +01:00
Grzegorz Leoniec
77cbf410d6
Merge branch 'master' into integration-testing 2018-11-30 14:35:31 +01:00
Grzegorz Leoniec
8ebaf41b77
Merge branch 'master' into locations 2018-11-30 14:35:10 +01:00
Grzegorz Leoniec
86b4684c1d
Merge branch 'master' into adapt-styleguide-docs 2018-11-30 14:34:28 +01:00
Grzegorz Leoniec
22200e6d3b
updated .gitignore 2018-11-30 12:36:52 +01:00
mediadivision
f0b34ab274 adapt docs to styleguide integration 2018-11-30 12:35:39 +01:00
Grzegorz Leoniec
bcc8b170c0 Update issue templates 2018-11-30 12:32:23 +01:00
Grzegorz Leoniec
7f7d2c2c2f
Merge branch 'master' into integration-testing 2018-11-30 12:28:40 +01:00
Grzegorz Leoniec
f3f652a32f
Merge branch 'master' into locations 2018-11-30 12:28:24 +01:00
Grzegorz Leoniec
56da202ed5
Merge pull request #55 from Human-Connection/better-styleguide-integration 
Integrate styleguide with hot reload
 2018-11-30 12:27:59 +01:00
Grzegorz Leoniec
d54fa3f85b merged master in 2018-11-30 12:09:37 +01:00
Grzegorz Leoniec
b3f19694f7 merged master in 2018-11-30 11:45:37 +01:00
dependabot[bot]
81605221a7
Bump neo4j from 3.4 to 3.5.0 
Bumps neo4j from 3.4 to 3.5.0.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-30 10:42:25 +00:00
Grzegorz Leoniec
f78178c545
Merge pull request #38 from Human-Connection/upgrade-packages 
uppgraded packages
 2018-11-30 11:40:18 +01:00
Grzegorz Leoniec
7780c4b846 uppgraded packages 2018-11-30 11:37:19 +01:00
Grzegorz Leoniec
cc112e373e
Merge branch 'master' into better-styleguide-integration 2018-11-30 10:35:16 +01:00