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

2682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
7ce375e435
Merge pull request #473 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.15.0 
Bump tiptap-extensions from 1.14.0 to 1.15.0 in /webapp
 2019-04-16 22:13:00 +02:00
dependabot[bot]
0468d9972c
Bump tiptap-extensions from 1.14.0 to 1.15.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.14.0...tiptap-extensions@1.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-16 04:55:13 +00:00
mattwr18
f6eb5474d1
Merge pull request #471 from Human-Connection/disable_cypres_recordings 
Disable cypress test recordings
 2019-04-15 16:59:51 -03:00
Robert Schäfer
5c71bbdc6f
Merge pull request #467 from Human-Connection/dependabot/npm_and_yarn/webapp/v-tooltip-2.0.1 
Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp
 2019-04-15 20:34:36 +02:00
Robert Schäfer
4409792c20
Merge pull request #468 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.6.0 
Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in /webapp
 2019-04-15 20:33:48 +02:00
Robert Schäfer
6e8661e29e
Merge pull request #465 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.3 
Bump graphql-shield from 5.3.2 to 5.3.3 in /backend
 2019-04-15 17:47:10 +02:00
Robert Schäfer
989fc018cf Disable cypress test recordings 
Because of: https://github.com/Human-Connection/Human-Connection/issues/470
 2019-04-15 17:47:02 +02:00
Robert Schäfer
a723611aba
Merge pull request #466 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.17.1 
Bump eslint-plugin-import from 2.16.0 to 2.17.1 in /backend
 2019-04-15 17:46:51 +02:00
Robert Schäfer
73f2ff59e4
Merge pull request #237 from Human-Connection/236-list-social-media-accounts 
List socialMedia links
 2019-04-15 12:07:10 +02:00
dependabot[bot]
bd5b3f4ffb
Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.6.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:55:09 +00:00
dependabot[bot]
2762b080a2
Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:54:01 +00:00
dependabot[bot]
38c2ee4fcc
Bump eslint-plugin-import from 2.16.0 to 2.17.1 in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.16.0 to 2.17.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.16.0...v2.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:47:45 +00:00
dependabot[bot]
fb6262a16a
Bump graphql-shield from 5.3.2 to 5.3.3 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.2 to 5.3.3.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.2...v5.3.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:47:18 +00:00
Robert Schäfer
3edfa42f1a
Merge pull request #460 from Human-Connection/docs-add_missing_env_instruction 
Add instruction to configure local cypress config
 2019-04-14 23:36:59 +02:00
Robert Schäfer
e212864d8b Add instruction to configure local cypress config 
cc @ulfgebhardt that was missing in the docs for you
 2019-04-12 21:58:33 +02:00
Robert Schäfer
c67825392c Silence expected error messages on build server 
@ulfgebhardt we have a quite lengthy log output on our build server.
This `2> /dev/null` prevents the server from writing log output for
expected errors. E.g. we're testing if a user can log in with incorrect
credentials or we try to create duplicates for unique slugs. All of this
will output errors to the command line which we're not interested in.

We could think of configuring the `package.json` in a way that outputs
these error messages in case we set an environment variable:
```
DEBUG=1 yarn run test:jest
```
That would be an option. Or use the `debug` npm packages that
@Mastercuber has introduced.
 2019-04-12 21:12:36 +02:00
Robert Schäfer
7bc0851b90 Fix cypress test looking for English translations 
Oops, I edited the translations and did not think of cypress tests that
might depend on them, sorry cc @mattwr18
 2019-04-12 21:12:36 +02:00
Robert Schäfer
c1d6caca38
Merge pull request #406 from Human-Connection/keep_private_rsa_key_secret 
Don't expose private RSA key
 2019-04-12 20:09:31 +02:00
Robert Schäfer
702a239180
Merge pull request #459 from Human-Connection/roschaefer-patch-1 
Fix emojis, remove duplicate link
 2019-04-12 20:07:40 +02:00
Matt Rider
aadfd16374 Remove redundant "not" 2019-04-12 13:23:10 -03:00
Robert Schäfer
c10a8abbf1
Merge branch 'master' into roschaefer-patch-1 2019-04-12 18:13:34 +02:00
Robert Schäfer
5fa6417c7e
Merge pull request #455 from Human-Connection/docs_fix_link 
Fix links to documentation
 2019-04-12 18:06:34 +02:00
Robert Schäfer
85973be5b0 Contribute German translations for social media 2019-04-12 18:00:25 +02:00
Robert Schäfer
b75650ba38 Organize feature locations suggested by @datenbrei 2019-04-12 17:49:55 +02:00
Robert Schäfer
c0bff47275 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-12 17:49:14 +02:00
Robert Schäfer
0c8b478ce2 Update backend/src/middleware/passwordMiddleware.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 17:32:20 +02:00
Wolfgang Huß
023c636017 Query of "publicKey" is now tested unauthenticated and authenticated 2019-04-12 17:17:01 +02:00
Robert Schäfer
473ae9220a Fix emojis, remove duplicate link 2019-04-12 17:12:04 +02:00
Robert Schäfer
e5e1f0a9fc Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:41 +02:00
Robert Schäfer
828ca50f19 Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:30 +02:00
Robert Schäfer
008d99c6ef Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:10 +02:00
Robert Schäfer
96c6bd45c2 Fix links to documentation 2019-04-12 16:27:48 +02:00
Robert Schäfer
52be393050
Merge pull request #387 from Human-Connection/342-merge_documentation 
342 merge documentation
 2019-04-12 16:12:20 +02:00
Robert Schäfer
e89e038158 Prevent cypress from parsing markdown files 
If there is a README.md in `integration/` folder, cypress crashes.
 2019-04-12 14:54:40 +02:00
Robert Schäfer
d3ff3ca241 Merge remote-tracking branch 'origin/master' into 342-merge_documentation 2019-04-12 14:48:27 +02:00
Robert Schäfer
97dd3f8bee Link cucumber features in feature specification 2019-04-12 14:44:22 +02:00
Wolfgang Huß
b007015eeb Backend test for query "publicKey" to asure that "privatKey" is generated 
Minor approofments.
 2019-04-12 14:30:04 +02:00
Ulf Gebhardt
39c6c97eda
Merge pull request #440 from Human-Connection/2019/kw15/design_differences_post 
2019/kw15/design_differences_post
 2019-04-12 14:14:24 +02:00
Robert Schäfer
5fd269f419 Restructure feature specification 2019-04-12 14:04:46 +02:00
Robert Schäfer
705493daff Update kubernetes README 2019-04-12 14:01:28 +02:00
Robert Schäfer
f7a1ca9911 Remove deployment todos 2019-04-12 13:55:22 +02:00
Robert Schäfer
9c79634964 And lowercase the last three items for consistency 2019-04-12 13:54:17 +02:00
Robert Schäfer
d75509a148 Name the first gitbook item "Introduction" 2019-04-12 13:53:35 +02:00
Robert Schäfer
216fc2b67c DRY + Better naming: Testing flavours and Github 
cc @mattwr18

I would suggest that each subfolder like `/backend/`, `/webapp/`,
`/deployment/` and so on should have a file README.md. Thus, not only
gitbook will pick it up but also Github itself. Github is looking for a
file called README.md when iterating through subfolders.
 2019-04-12 13:48:47 +02:00
Robert Schäfer
901f5b5b22 Move deployment in separate folder 2019-04-12 13:37:31 +02:00
Ulf Gebhardt
c2ef3c9c44
possible fix for cypress create post 2019-04-12 13:37:12 +02:00
Robert Schäfer
61ee8b3a52 Remove documentation/ folder 
I believe, this was created through the Gitbook UI, is that right
@mattwr18?
 2019-04-12 13:34:28 +02:00
Matt Rider
444f01f879 Refactor test, component 
- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
 2019-04-12 08:34:06 -03:00
Robert Schäfer
627487629b Merge more READMEs 2019-04-12 13:28:10 +02:00
Ulf Gebhardt
00a95f956a
cypress fixes (windows) 2019-04-12 13:24:15 +02:00