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

3734 Commits

Author SHA1 Message Date
Matt Rider
08899a4af9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-01 09:22:57 +02:00
Matt Rider
8d7c55c97d Use a link's username, open separate window on click 2019-08-01 07:34:52 +02:00
dependabot-preview[bot]
008c9fb490
Bump eslint-plugin-jest from 22.14.0 to 22.14.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.14.0 to 22.14.1.
- [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.14.0...v22.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 04:25:35 +00:00
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ß
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
Matt Rider
5423412958 Set up UI 2019-07-31 14:58:05 +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
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
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media 
🍰 Refine social media
 2019-07-29 16:08:08 +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
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
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
Matt Rider
19b2b7a491 Reset branch to master, copy changes to ContributionForm in 2019-07-29 08:45:58 +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]
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]
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
ogerly
0c75d6e089 Fix commit 2019-07-24 16:03:10 +02:00
ogerly
77f45c1508 esoolved comments @tirokk 2019-07-24 15:35:08 +02:00
dependabot-preview[bot]
f344abaf9a
Bump date-fns from 2.0.0-beta.2 to 2.0.0-beta.3 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.2 to 2.0.0-beta.3.
- [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-beta.2...v2.0.0-beta.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-24 04:33:59 +00:00
Matt Rider
88a14ebd4f Add tests, fix typo 2019-07-23 10:55:07 -03:00
Alina Beck
d1cb72b9a0 disable save button when link has not been changed 2019-07-23 14:51:45 +02:00
Alina Beck
fcc6a4a084 center arrow icon in list 2019-07-23 14:48:28 +02:00
Alina Beck
ee43d4aaa7 refactor frontend tests 2019-07-23 14:25:52 +02:00
mattwr18
f65a167531
Merge pull request #1098 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/eslint-config-prettier-5.0.0 
Bump @vue/eslint-config-prettier from 4.0.1 to 5.0.0 in /webapp
 2019-07-23 05:27:57 -03:00
Matt Rider
da298fe095 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 375-Sorting-II 2019-07-23 05:25:48 -03:00
dependabot-preview[bot]
4d7c1367f1
Bump @vue/eslint-config-prettier from 4.0.1 to 5.0.0 in /webapp 
Bumps [@vue/eslint-config-prettier](https://github.com/vuejs/eslint-config-prettier) from 4.0.1 to 5.0.0.
- [Release notes](https://github.com/vuejs/eslint-config-prettier/releases)
- [Changelog](https://github.com/vuejs/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/eslint-config-prettier/commits/v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-23 04:29:33 +00:00
dependabot-preview[bot]
511edfd4bd
Bump eslint-plugin-jest from 22.11.1 to 22.13.6 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.11.1 to 22.13.6.
- [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.11.1...v22.13.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-23 04:29:02 +00:00
Robert Schäfer
f71e481824 Fix import path 2019-07-22 14:01:55 +02:00
Robert Schäfer
281026b04c Downgrade css-loader to < 3.0.0 
To workaround
```
Module build failed (from ./node_modules/css-loader/dist/cjs.js):
ValidationError: CSS Loader Invalid Options

options should NOT have additional properties
```

Some silly package of us is not up-to-date and still sends
`exportOnlyLocals` to `css-loader` thus raising this error. I don't know
which, so I'll downgrade css-loader to `2.x.x` which has the old API.
 2019-07-22 13:56:51 +02:00
Robert Schäfer
455eac1031 Merge remote-tracking branch 'origin/master' into storybook 2019-07-22 13:27:32 +02:00
Matt Rider
c8a6792627 Add parent class for css selector on cypress/component 2019-07-22 06:50:58 -03:00
Matt Rider
69de04f1eb Remove extra parantheses 2019-07-22 05:52:01 -03:00
Wolfgang Huß
00879fc2fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 256-editor-embeds-merge-in-nitro-embed 
# Conflicts:
#	backend/package.json
#	backend/yarn.lock
 2019-07-22 10:51:23 +02:00
Matt Rider
211508f183 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 375-Sorting-II 2019-07-22 05:42:30 -03:00
dependabot-preview[bot]
b9eae65b8b
Bump eslint-plugin-import from 2.18.0 to 2.18.2 in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2.
- [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.18.0...v2.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 04:51:16 +00:00
Robert Schäfer
7a9d9339f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 256-editor-embeds-merge-in-nitro-embed 2019-07-20 14:45:41 +02:00
Robert Schäfer
b3712d9e11 Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-19 20:18:10 +02:00
dependabot-preview[bot]
b29a15db7f
Bump @babel/preset-env from 7.5.4 to 7.5.5 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 18:14:44 +00:00
Robert Schäfer
a56dded667
Merge pull request #1080 from Human-Connection/1003-Page-for-Imprint 
Created imprint page, added English translations
 2019-07-19 15:25:20 +02:00
Robert Schäfer
949b839a9f
Merge pull request #1076 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.5 
Bump @babel/core from 7.5.4 to 7.5.5 in /webapp
 2019-07-19 15:19:45 +02:00
Alexander Friedland
4fe3c08402
Merge branch 'master' into 375-Sorting-II 2019-07-19 11:53:01 +02:00
ogerly
063479610e fix lint 2019-07-19 10:28:13 +02:00