ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,214 Commits 113 Branches 1,511 Tags
Commit Graph

3214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
eb6a9b3034
added vscode settings to project, removed ignore from gitignore for .vscode folder 2019-05-18 14:36:35 +02:00
Ulf Gebhardt
35853c049e
prettier setting frontend 2019-05-18 14:35:58 +02:00
Robert Schäfer
45694b0f89
Merge pull request #617 from Human-Connection/dependabot/npm_and_yarn/backend/node-fetch-2.6.0 
Bump node-fetch from 2.5.0 to 2.6.0 in /backend
 2019-05-17 22:41:15 +02:00
Robert Schäfer
170f1cc35b
Merge pull request #618 from Human-Connection/dependabot/npm_and_yarn/backend/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /backend
 2019-05-17 22:40:51 +02:00
Robert Schäfer
ee1af607de
Merge pull request #619 from Human-Connection/dependabot/npm_and_yarn/webapp/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /webapp
 2019-05-17 22:40:34 +02:00
Robert Schäfer
f952e131e0
Merge pull request #620 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-4.3.0 
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp
 2019-05-17 22:40:08 +02:00
Robert Schäfer
d39241b9ec
Merge pull request #621 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/apollo-4.0.0-rc4.2 
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp
 2019-05-17 22:39:49 +02:00
dependabot[bot]
1095d98131
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4.1 to 4.0.0-rc4.2.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4.1...v4.0.0-rc.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:52:11 +00:00
dependabot[bot]
505098dd2d
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:47 +00:00
dependabot[bot]
8df1648c5e
Bump express from 4.16.4 to 4.17.0 in /webapp 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:10 +00:00
dependabot[bot]
4bc6363eff
Bump express from 4.16.4 to 4.17.0 in /backend 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:48:14 +00:00
dependabot[bot]
f0272ef8ed
Bump node-fetch from 2.5.0 to 2.6.0 in /backend 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/bitinn/node-fetch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.5.0...v2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:47:39 +00:00
mattwr18
3612eae2af
Merge pull request #610 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp
 2019-05-17 00:43:28 -03:00
Matt Rider
69a01d31f9 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:11:27 -03:00
Matt Rider
6825c58e0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:10:16 -03:00
dependabot[bot]
041c9056e7
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.4.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.2...tiptap-extensions@1.19.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 03:06:55 +00:00
mattwr18
83ed3f2b97
Merge pull request #611 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.19.3 
Bump tiptap from 1.19.2 to 1.19.3 in /webapp
 2019-05-17 00:04:49 -03:00
Robert Schäfer
b1923e0c84
Merge pull request #524 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.0 
Bump neo4j-graphql-js from 2.4.2 to 2.6.0 in /backend
 2019-05-17 01:30:06 +02:00
Robert Schäfer
8111bc2190 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.0 2019-05-17 00:15:54 +02:00
Robert Schäfer
a819d6353a Fix probably randomly failing cypress test 
@mattwr18 @ulfgebhardt @tirokk @appinteractive @ogerly

I think I just fixed a randomly failing test (so-called "flaky" test).
After an update of `neo4j-graphql-js` I wondered why the
`TagsAndCategories.feature` test failed consistently. It turns out the
table that you can see in the test is ordered by the "Users" column:

|   | Name      | Users  | Posts    |
| 1 | Democracy | 2      | 3        |
| 2 | Ecology   | 1      | 1        |
| 3 | Nature    | 1      | 2        |

So there is a tie between row 2 and row 3. It seems that on version
2.4.0 the backend would return those rows in arbitrary order and now it
returns them in a deterministic order, thus failing the test every time.

Therefore I changed the test setup and I believe this should also make
the build more robust now.
 2019-05-17 00:09:54 +02:00
Robert Schäfer
91b1ee7085
Merge pull request #612 from Human-Connection/tansaku-patch-1 
Update CONTRIBUTING.md with codereview notes
 2019-05-16 23:40:59 +02:00
Sam Joseph
f16b400340
Update CONTRIBUTING.md 2019-05-16 12:58:55 +01:00
dependabot[bot]
f001f7b5e3
Bump tiptap from 1.19.2 to 1.19.3 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.2...tiptap@1.19.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 04:46:33 +00:00
dependabot[bot]
75d54130ea
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.4.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.2...tiptap-extensions@1.19.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 04:45:56 +00:00
mattwr18
3c09012833
Merge pull request #607 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.7.1 
Bump nuxt from 2.6.3 to 2.7.1 in /webapp
 2019-05-15 23:23:23 -03:00
mattwr18
1965c81303
Merge pull request #606 from Human-Connection/dependabot/npm_and_yarn/codecov-3.5.0 
Bump codecov from 3.4.0 to 3.5.0
 2019-05-15 23:22:56 -03:00
Robert Schäfer
5881a7d5df
Merge pull request #573 from Human-Connection/docs-354-kubernetes_cron_job_for_backups 
Docs 354 kubernetes cron job for backups
 2019-05-15 18:52:53 +02:00
Robert Schäfer
042f208c1c
Merge pull request #608 from Human-Connection/docs-update_https_configuration 
Docs update https configuration
 2019-05-15 16:44:12 +02:00
Robert Schäfer
0ef2c26f03 Clean up and add a content warning 2019-05-15 16:25:01 +02:00
Robert Schäfer
1b3ee63565 Document Volume Snapshots 2019-05-15 16:25:01 +02:00
Robert Schäfer
222b153242 Provide volume snapshot according to DO support 
Read:
https://github.com/Human-Connection/Human-Connection/pull/573#issuecomment-491358847
 2019-05-15 16:25:01 +02:00
Robert Schäfer
018dd89797 Followed docs for heptio-ark and DO plugin v0.11.0 2019-05-15 16:24:05 +02:00
Robert Schäfer
8485b583a4 Update docs, remove redundant instructions 2019-05-15 16:24:05 +02:00
Robert Schäfer
90aae2f872 Add docs how to setup velero schedules 2019-05-15 16:24:05 +02:00
Robert Schäfer
ee7401be23 Swap offline-backups with velero in docs' ToC 2019-05-15 16:24:05 +02:00
Robert Schäfer
49e6457cfd Setup relevant annotations 2019-05-15 16:24:05 +02:00
Robert Schäfer
e2ecd7904d Write docs for Velero and Disaster Recovery 2019-05-15 16:24:05 +02:00
Robert Schäfer
d70719040e Consequently create another template folder 
... in human-connection/ where we store our specific kubernetes
configuraitons.
 2019-05-15 14:01:07 +02:00
Robert Schäfer
24fe55c2d5 Streamline https configuration 
I added a folder /templates to make it easier to reproduce.
 2019-05-15 14:01:07 +02:00
dependabot[bot]
626fcfdc11
Bump nuxt from 2.6.3 to 2.7.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.6.3 to 2.7.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.6.3...2.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-15 10:47:07 +00:00
mattwr18
5980f969bc
Merge pull request #602 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.19.2 
Bump tiptap from 1.19.0 to 1.19.2 in /webapp
 2019-05-15 07:18:31 -03:00
dependabot[bot]
650d2529f0
Bump codecov from 3.4.0 to 3.5.0 
Bumps [codecov](https://github.com/codecov/codecov-node) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-15 04:50:29 +00:00
mattwr18
7106549316
Merge pull request #603 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.2.1 
Bump cypress-plugin-retries from 1.2.0 to 1.2.1
 2019-05-15 00:30:36 -03:00
Matt Rider
11743b4043 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-1.19.2' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.19.2 2019-05-15 00:29:49 -03:00
dependabot[bot]
58d2c72595
Bump tiptap from 1.19.0 to 1.19.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.0 to 1.19.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.0...tiptap@1.19.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-15 03:28:59 +00:00
Matt Rider
1d11f5d574 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.19.2 2019-05-15 00:28:54 -03:00
mattwr18
1f1cdd0826
Merge pull request #601 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.2 
Bump tiptap-extensions from 1.19.1 to 1.19.2 in /webapp
 2019-05-15 00:26:18 -03:00
mattwr18
57556e8a8d
Merge pull request #604 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/apollo-4.0.0-rc4.1 
Bump @nuxtjs/apollo from 4.0.0-rc4 to 4.0.0-rc4.1 in /webapp
 2019-05-15 00:25:51 -03:00
mattwr18
b233255501
Merge pull request #598 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.0 
Bump eslint-plugin-prettier from 3.0.1 to 3.1.0 in /webapp
 2019-05-15 00:25:26 -03:00
dependabot[bot]
45c64db90f
Bump neo4j-graphql-js from 2.4.2 to 2.6.0 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.4.2 to 2.6.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>
 2019-05-14 21:15:12 +00:00