ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-16 01:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,491 Commits 103 Branches 1,536 Tags
Commit Graph

8491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
84cdfa8a19
Merge pull request #2834 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.6 
build(deps-dev): bump @storybook/addon-notes from 5.3.5 to 5.3.6 in /webapp
 2020-01-20 09:28:20 +01:00
mattwr18
bfd38e4108
Merge pull request #2833 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.10.5 
build(deps): bump metascraper-youtube from 5.10.3 to 5.10.5 in /backend
 2020-01-20 09:28:03 +01:00
mattwr18
ecd10d3868
Merge pull request #2830 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.10.5 
build(deps): bump metascraper from 5.10.3 to 5.10.5 in /backend
 2020-01-20 09:27:37 +01:00
mattwr18
8d6fb236fd
Merge pull request #2829 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.10.5 
build(deps): bump metascraper-soundcloud from 5.10.3 to 5.10.5 in /backend
 2020-01-20 09:27:20 +01:00
dependabot-preview[bot]
d4356df6ba
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.10.3 to 5.10.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.3...v5.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 04:22:25 +00:00
dependabot-preview[bot]
731fd1ad18
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.5 to 5.3.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.6/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 04:20:48 +00:00
dependabot-preview[bot]
df35ba750a
build(deps): bump metascraper-youtube from 5.10.3 to 5.10.5 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.10.3 to 5.10.5.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 04:20:34 +00:00
dependabot-preview[bot]
225fd0235e
build(deps): bump metascraper from 5.10.3 to 5.10.5 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.10.3 to 5.10.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.3...v5.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 04:19:17 +00:00
dependabot-preview[bot]
5d77b2a47e
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.10.3 to 5.10.5.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 04:18:45 +00:00
Robert Schäfer
d3473050c4
Merge pull request #2725 from Human-Connection/2229_remove_obsolete_translation 
fix(translations): Remove duplicate and mistranslated item from code of conduct
 2020-01-17 22:28:10 +01:00
Robert Schäfer
1e75aca5fb
Merge pull request #2820 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.6 
build(deps-dev): bump @storybook/addon-a11y from 5.3.3 to 5.3.6 in /webapp
 2020-01-17 18:38:31 +01:00
roschaefer
178143dfb7 refactor(modules): Various import fixes 
* DRY schema stitching code
* Use same `.env` configuration file for cypress tests

That last part I couldn't improve a lot. I thought it might be possible
with cypress to import all files from a folder. But since it must be
browser compatible and our backend is not using webpack or anything,
it remains a goal unreached.

close #2773
close #2774
 2020-01-17 15:59:19 +01:00
Wolfgang Huß
35660ca073 Implemented the notifications for filling reports Notification.vue 2020-01-17 15:56:30 +01:00
dependabot-preview[bot]
00665f789e
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.3 to 5.3.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.6/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 14:47:01 +00:00
Robert Schäfer
26dca113f0
Merge pull request #2808 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.10.3 
build(deps): bump metascraper from 5.10.2 to 5.10.3 in /backend
 2020-01-17 15:44:49 +01:00
Robert Schäfer
05a6cb2296
Merge pull request #2819 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.6 
build(deps-dev): bump @storybook/vue from 5.3.3 to 5.3.6 in /webapp
 2020-01-17 15:44:39 +01:00
dependabot-preview[bot]
22490b088d
build(deps): bump metascraper from 5.10.2 to 5.10.3 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.2...v5.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 10:35:18 +00:00
Robert Schäfer
31b866ab9a
build(deps): bump faker from 9fd8d7d to 3b2fa4a in /backend (#2803) 
Bumps [faker](https://github.com/Marak/faker.js) from `9fd8d7d` to `3b2fa4a`.
- [Release notes](https://github.com/Marak/faker.js/releases)
- [Commits](9fd8d7d37b...3b2fa4aebc)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:34:11 +01:00
dependabot-preview[bot]
a007a709c4 build(deps-dev): bump faker from 9fd8d7d to 3b2fa4a (#2804) 
Bumps [faker](https://github.com/Marak/faker.js) from `9fd8d7d` to `3b2fa4a`.
- [Release notes](https://github.com/Marak/faker.js/releases)
- [Commits](9fd8d7d37b...3b2fa4aebc)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:33:56 +01:00
dependabot-preview[bot]
1a82d0fd47
build(deps-dev): bump @storybook/vue from 5.3.3 to 5.3.6 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.3 to 5.3.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.6/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 10:33:43 +00:00
dependabot-preview[bot]
f8f3696837 build(deps-dev): bump @storybook/addon-a11y in /webapp (#2809) 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.3 to 5.3.5.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.5/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:33:17 +01:00
dependabot-preview[bot]
440e790a82 build(deps): bump uuid from 3.3.3 to 3.4.0 in /backend (#2810) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.3.3...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:32:56 +01:00
dependabot-preview[bot]
0010774722 build(deps): bump metascraper-image from 5.9.5 to 5.10.3 in /backend (#2811) 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.9.5 to 5.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.9.5...v5.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:32:12 +01:00
dependabot-preview[bot]
26e849898f build(deps-dev): bump node-sass from 4.13.0 to 4.13.1 in /webapp (#2812) 
Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.13.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:31:53 +01:00
dependabot-preview[bot]
1bd432211f build(deps): bump metascraper-audio from 5.9.5 to 5.10.3 in /backend (#2813) 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.9.5 to 5.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.9.5...v5.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:31:35 +01:00
dependabot-preview[bot]
11bc5522b9 build(deps): bump metascraper-soundcloud in /backend (#2815) 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.9.5 to 5.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:31:01 +01:00
dependabot-preview[bot]
ac1470b397 build(deps-dev): bump @storybook/addon-notes in /webapp (#2816) 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.3 to 5.3.5.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.5/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 11:30:42 +01:00
mattwr18
1112703785
Merge pull request #2807 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.5 
build(deps-dev): bump @storybook/addon-actions from 5.3.3 to 5.3.5 in /webapp
 2020-01-17 07:29:41 +01:00
mattwr18
bfa7041dd0
Merge pull request #2806 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.10.3 
build(deps): bump metascraper-description from 5.9.5 to 5.10.3 in /backend
 2020-01-17 07:28:38 +01:00
mattwr18
5631813c61
Merge pull request #2805 from Human-Connection/dependabot/npm_and_yarn/backend/mustache-4.0.0 
build(deps): bump mustache from 3.2.1 to 4.0.0 in /backend
 2020-01-17 07:28:00 +01:00
dependabot-preview[bot]
321baeb127
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.3 to 5.3.5.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.5/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 04:20:32 +00:00
dependabot-preview[bot]
25267017ac
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.9.5 to 5.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.9.5...v5.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 04:20:03 +00:00
dependabot-preview[bot]
99b3c4191c
build(deps): bump mustache from 3.2.1 to 4.0.0 in /backend 
Bumps [mustache](https://github.com/janl/mustache.js) from 3.2.1 to 4.0.0.
- [Release notes](https://github.com/janl/mustache.js/releases)
- [Changelog](https://github.com/janl/mustache.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janl/mustache.js/compare/v3.2.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 04:19:37 +00:00
dependabot-preview[bot]
1a23115376
build(deps): bump faker from 9fd8d7d to 3b2fa4a in /backend 
Bumps [faker](https://github.com/Marak/faker.js) from `9fd8d7d` to `3b2fa4a`.
- [Release notes](https://github.com/Marak/faker.js/releases)
- [Commits](9fd8d7d37b...3b2fa4aebc)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 04:18:23 +00:00
mattwr18
db63b810e0
Merge pull request #2728 from Human-Connection/1831-show_release_version 
🍰 feat(webapp): Display deployed version in footer
 2020-01-16 21:38:50 +01:00
roschaefer
c22a6330aa refactor(translations): Fix keys for muting 
Provide the correct German translation. Remove "" and use `null` for
Italian. @mattwr18 we really have to make sure not to add empty strings
to our translations because we disable the fallback in that case. Also,
if we want, we could replace the other translations with `null` in order
to make sure that we have the better (though untranslated) explanation.

@mattwr18 I had a look into `notificationsMiddleware.js`. I think that
we can still keep the tests and the behaviour although there is no
`BLOCKED` relationship anymore, right?
 2020-01-16 20:56:12 +01:00
roschaefer
e4cb7eb52a chore(ci): Remove chromium as it became obsolete 2020-01-16 20:27:39 +01:00
mattwr18
b53bf880ee Fix lint 2020-01-16 20:23:36 +01:00
roschaefer
c5a6919833 Merge remote-tracking branch 'origin/master' into 279-blacklist-users-content 2020-01-16 19:48:16 +01:00
mattwr18
4fdcbc78aa fix: cypress breaks locally in login step (#2776) 
- We do not need to simulate a user closing the toaster, as this is not
that common of a user interaction, fails intermittently locally, and
costs unnecessary build time
 2020-01-16 19:30:25 +01:00
roschaefer
4631db0a1b feat(webapp): Display deployed version in footer 
Remove VERSION file in favour of version entry in `package.json`. Parse
this version in our build server scripts.

This commit also introduces `standard-version` which we can use to
generate our `CHANGELOG.md` with `yarn run release`.

close #1831
 2020-01-16 19:24:55 +01:00
mattwr18
f13eb29ad3
Merge pull request #2378 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 
build(deps-dev): bump @vue/test-utils from 1.0.0-beta.29 to 1.0.0-beta.30 in /webapp
 2020-01-16 17:16:13 +01:00
dependabot-preview[bot]
6568b181e1 build(deps): bump metascraper-youtube from 5.9.5 to 5.10.3 in /backend (#2794) 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.9.5 to 5.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-16 16:56:10 +01:00
Wolfgang Huß
f2d4d97645 Lint fix in backend 2020-01-16 15:55:26 +01:00
Wolfgang Huß
d4e5de5eff Approach the first time to get the new notifications in the frontend 2020-01-16 15:52:07 +01:00
mattwr18
5eb42830fd Revert unintended changes to ContributionForm.spec 2020-01-16 15:47:55 +01:00
Robert Schäfer
6b1538a013
Merge pull request #2795 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.10.3 
build(deps): bump metascraper-video from 5.9.5 to 5.10.3 in /backend
 2020-01-16 15:02:19 +01:00
mattwr18
0a4defe36d Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 14:52:58 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
Wolfgang Huß
acad4e4c00 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-01-16 13:57:50 +01:00