IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,562 Commits 5 Branches 2 Tags
Commit Graph

4562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
72edf78889 Meld a chaotic commit history into one commit 
Some important commit messages:

```
    Fix youtu.be not being embedded

    And also try to maintain the old behaviour matching
    `provider.provider_url`.
```

```
    Remove confusing code comments and obsolete code

    I discovered that the behaviour of no duplicate notifications being send
    out is caused by the frontend: When the editor reads html from the
    backend, it will parse hashtags and mentions as ordinary links, not as
    their respective nodes during editing. Also, we don't have to worry
    about duplicate ids being found: The cypher statement will implicitly
    suppress duplicate notification nodes for the same user.

    So let's remove the code to avoid confusing the next developer.
```

```
    Test editor.getHTML()

    I do this because I'm not able to test the content of `this.editor` from
    a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
    and use it as a computed property `renderedContent` to populate a `<div
    v-html="renderedContent" />` this will not work for the embeds. So, my
    current best bet is to test the editor object isolated from a real
    component. ;(
```

```
    Add core-js as explicit dependency

    Because of build errors on Travis.

    See: https://stackoverflow.com/a/55313456

    Remove as soon as this issue is resolved:
    https://github.com/storybookjs/storybook/issues/7591

```

```
    Refactor: Keep Runtime-only builds

    See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
 2019-08-01 00:28:22 +02:00
Robert Schäfer
34f86c95a0 Merge remote-tracking branch 'origin/master' into storybook 2019-08-01 00:08:15 +02:00
Wolfgang Huß
5a6cdb04c2
Merge pull request #977 from Human-Connection/806-HcContributionForm-submit-is-not-disabled-by-default 
HcContributionForm submit is disabled by default
 2019-07-31 17:27:55 +02:00
Robert Schäfer
a96437e54c Github you're stupid 
No merge conflicts but you say:
```
This branch has conflicts that must be resolved
```
😫
 2019-07-31 15:55:13 +02:00
Wolfgang Huß
c1a13f3e0a
Merge pull request #977 from Human-Connection/806-HcContributionForm-submit-is-not-disabled-by-default 
HcContributionForm submit is disabled by default
 2019-07-31 15:20:03 +02:00
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II 
375 sorting (II)
 2019-07-31 14:49:37 +02:00
Wolfgang Huß
6a6f1c5556 Removed submit function at the form 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-31 14:09:04 +02:00
Wolfgang Huß
49f5851d2c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 806-HcContributionForm-submit-is-not-disabled-by-default 2019-07-31 13:14:43 +02:00
Wolfgang Huß
c9ad86c863 Fixed jest tests 2019-07-31 13:11:31 +02:00
Wolfgang Huß
51321df931 In the middle of refactoring the tests 2019-07-31 12:19:47 +02:00
mattwr18
115680c2eb
Merge pull request #1141 from Human-Connection/fix_console_errors 
Fix console.errors during `yarn run test`
 2019-07-31 07:43:13 +02:00
mattwr18
664eb7f1d3
Merge pull request #1144 from Human-Connection/dependabot/npm_and_yarn/webapp/vuex-i18n-1.13.0 
Bump vuex-i18n from 1.11.0 to 1.13.0 in /webapp
 2019-07-31 07:41:15 +02:00
dependabot-preview[bot]
e080b015f0
Bump vuex-i18n from 1.11.0 to 1.13.0 in /webapp 
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n) from 1.11.0 to 1.13.0.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases)
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.11.0...v1.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-31 04:25:12 +00:00
Robert Schäfer
c24452c8a0 Fix console.errors during yarn run test 
@mattwr18 you added `currentUser` in 19b2b7a49 without running the tests,
didn't you?
 2019-07-30 21:13:44 +02:00
Robert Schäfer
c20eead22e
Merge pull request #1136 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.8.0 
Bump apollo-server-testing from 2.7.2 to 2.8.0 in /backend
 2019-07-30 15:45:15 +02:00
Robert Schäfer
534afc003f
Merge pull request #1137 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.8.0 
Bump apollo-server from 2.7.2 to 2.8.0 in /backend
 2019-07-30 15:44:59 +02:00
dependabot-preview[bot]
e996b39741
Bump apollo-server-testing from 2.7.2 to 2.8.0 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.7.2 to 2.8.0.
- [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/compare/apollo-server-testing@2.7.2...apollo-server-testing@2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 10:45:34 +00:00
dependabot-preview[bot]
e7449b3774
Bump apollo-server from 2.7.2 to 2.8.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.7.2 to 2.8.0.
- [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/compare/apollo-server@2.7.2...apollo-server@2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 10:45:30 +00:00
Robert Schäfer
8f19c954eb
Merge pull request #1138 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-middleware-3.0.3 
Bump graphql-middleware from 3.0.2 to 3.0.3 in /backend
 2019-07-30 12:43:26 +02:00
dependabot-preview[bot]
ddefe81b9d
Bump graphql-middleware from 3.0.2 to 3.0.3 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.2...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 04:27:44 +00:00
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media 
🍰 Refine social media
 2019-07-29 16:08:08 +02:00
mattwr18
ab022d6bbb
Merge pull request #1128 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.7.2 
Bump apollo-server from 2.7.0 to 2.7.2 in /backend
 2019-07-29 12:17:55 +02:00
mattwr18
82c515d84f
Merge pull request #1127 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.2 
Bump apollo-server-testing from 2.7.0 to 2.7.2 in /backend
 2019-07-29 12:17:37 +02:00
Wolfgang Huß
86777a0a2d
Merge pull request #936 from Human-Connection/760_post-author-last-active 
Add details to contribution form
 2019-07-29 11:13:49 +02:00
Wolfgang Huß
1a1ab418a3 Fix tests and change variable names 2019-07-29 11:01:15 +02:00
Wolfgang Huß
3a153c47c2
Merge pull request #956 from Human-Connection/906-maintenace-mode 
Maintenance service to support maintenance mode
 2019-07-29 10:50:52 +02:00
Wolfgang Huß
fbe304685a
Merge pull request #1132 from Human-Connection/gitignore-ssh-directory 
Gitignore ssh directory
 2019-07-29 10:06:16 +02:00
mattwr18
814421a864
Merge pull request #1131 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.17 
Bump cookie-universal-nuxt from 2.0.16 to 2.0.17 in /webapp
 2019-07-29 09:29:39 +02:00
mattwr18
c2e69bd564
Merge pull request #1130 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.14.0 
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /backend
 2019-07-29 09:28:57 +02:00
mattwr18
0183788eb5
Merge pull request #1129 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.14.0 
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /webapp
 2019-07-29 09:28:28 +02:00
dependabot-preview[bot]
31d093ed47
Bump apollo-server from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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/compare/apollo-server@2.7.0...apollo-server@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 07:26:46 +00:00
Matt Rider
3d7d735418 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.2 2019-07-29 09:26:08 +02:00
mattwr18
0cd929645e
Merge pull request #1126 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.7.2 
Bump apollo-server-express from 2.7.0 to 2.7.2 in /backend
 2019-07-29 09:24:23 +02:00
mattwr18
bd5d6829ff
Merge pull request #1118 from Human-Connection/dependabot/docker/backend/node-12.7-alpine 
Bump node from 12.6-alpine to 12.7-alpine in /backend
 2019-07-29 09:22:31 +02:00
mattwr18
0e9015e5ea
Merge pull request #1116 from Human-Connection/dependabot/docker/webapp/node-12.7-alpine 
Bump node from 12.6-alpine to 12.7-alpine in /webapp
 2019-07-29 09:22:02 +02:00
mattwr18
2a47ccd18a
Merge pull request #1115 from Human-Connection/increase_neo4j_space 
Give more space to neo4j-data
 2019-07-29 09:19:34 +02:00
mattwr18
8b4fd02398
Merge pull request #1114 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.6.3 
Bump metascraper-video from 4.10.2 to 5.6.3 in /backend
 2019-07-29 09:18:47 +02:00
mattwr18
10841626ef
Merge pull request #1113 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.20.0 
Bump helmet from 3.19.0 to 3.20.0 in /backend
 2019-07-29 09:18:02 +02:00
Matt Rider
6ba550f198 Make page mobile responsive, use styleguide font 2019-07-29 09:13:38 +02:00
Matt Rider
733d3333c9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 906-maintenace-mode 2019-07-29 08:52:10 +02:00
Matt Rider
19b2b7a491 Reset branch to master, copy changes to ContributionForm in 2019-07-29 08:45:58 +02:00
Matt Rider
08504ad2ff Gitignore ssh directory 2019-07-29 08:36:16 +02:00
dependabot-preview[bot]
0b9b42a8f2
Bump cookie-universal-nuxt from 2.0.16 to 2.0.17 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.16 to 2.0.17.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.16...v2.0.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:31:01 +00:00
dependabot-preview[bot]
8deee89c7e
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.13.6 to 22.14.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.13.6...v22.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:30:56 +00:00
dependabot-preview[bot]
b021437a7e
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.13.6 to 22.14.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.13.6...v22.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:30:17 +00:00
dependabot-preview[bot]
f2e20db838
Bump apollo-server-testing from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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/compare/apollo-server-testing@2.7.0...apollo-server-testing@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:29:19 +00:00
dependabot-preview[bot]
137a761f90
Bump apollo-server-express from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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/compare/apollo-server-express@2.7.0...apollo-server-express@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:28:13 +00:00
dependabot-preview[bot]
b0bde9f73e
Bump node from 12.6-alpine to 12.7-alpine in /backend 
Bumps node from 12.6-alpine to 12.7-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-26 04:22:08 +00:00
dependabot-preview[bot]
5380e74887
Bump node from 12.6-alpine to 12.7-alpine in /webapp 
Bumps node from 12.6-alpine to 12.7-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-26 04:22:06 +00:00
Robert Schäfer
9fcc5202d1 Give more space to neo4j-data 2019-07-25 15:34:43 +02:00