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

8179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
mattwr18
a448c3d954
Merge pull request #2796 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.10.3 
build(deps): bump metascraper-logo from 5.9.5 to 5.10.3 in /backend
 2020-01-16 13:49:08 +01:00
Robert Schäfer
9ca846dd55
Merge pull request #2582 from Human-Connection/button-migration-fixes 
refactor(styleguide): improve emotion buttons and header responsiveness
 2020-01-16 13:37:04 +01:00
mattwr18
83491e15c8 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 13:19:33 +01:00
mattwr18
3686a93878 Add nextTick to CreateUserAccount 
- there were changes that moved vue-test-utils from synchronous to
asynchronous, which means we need to use nextTick before checking
certain attributes.
 2020-01-16 13:15:35 +01:00
dependabot-preview[bot]
4e8be08afc
build(deps): bump metascraper-video from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-video](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-16 12:10:16 +00:00
Robert Schäfer
f52d185726
Merge pull request #2793 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.10.3 
build(deps): bump metascraper-url from 5.9.5 to 5.10.3 in /backend
 2020-01-16 13:08:04 +01:00
dependabot-preview[bot]
682a35f80b
build(deps): bump metascraper-logo from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-logo](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-16 11:18:35 +00:00
Robert Schäfer
16c16066bc
Merge pull request #2789 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.10.3 
build(deps): bump metascraper-author from 5.9.5 to 5.10.3 in /backend
 2020-01-16 12:16:23 +01:00
Robert Schäfer
508677f449
Merge pull request #2790 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.10.3 
build(deps): bump metascraper-lang from 5.9.5 to 5.10.3 in /backend
 2020-01-16 12:16:15 +01:00
dependabot-preview[bot]
ac0080db65
build(deps): bump metascraper-url from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-url](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-16 09:37:11 +00:00
dependabot-preview[bot]
1ef35d98de
build(deps): bump metascraper-author from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-author](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-16 09:36:31 +00:00
dependabot-preview[bot]
99aff422d0
build(deps): bump metascraper-lang from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-lang](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-16 09:36:27 +00:00
mattwr18
ff5a264841
Merge pull request #2792 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.10.3 
build(deps): bump metascraper-publisher from 5.9.5 to 5.10.3 in /backend
 2020-01-16 10:35:35 +01:00
mattwr18
92e1786cd6
Merge pull request #2791 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.10.3 
build(deps): bump metascraper-title from 5.9.5 to 5.10.3 in /backend
 2020-01-16 10:35:09 +01:00
mattwr18
5d02b3868d
Merge pull request #2788 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.11.1 
build(deps): bump @sentry/node from 5.11.0 to 5.11.1 in /backend
 2020-01-16 10:34:44 +01:00
mattwr18
16c1f1eec7
Merge pull request #2787 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.10.3 
build(deps): bump metascraper-date from 5.9.5 to 5.10.3 in /backend
 2020-01-16 10:34:24 +01:00
dependabot-preview[bot]
e331f307bc
build(deps): bump metascraper-publisher from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-publisher](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-16 04:21:52 +00:00
dependabot-preview[bot]
e376e1d989
build(deps): bump metascraper-title from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-title](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-16 04:21:16 +00:00
dependabot-preview[bot]
11111e709b
build(deps): bump @sentry/node from 5.11.0 to 5.11.1 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.11.0 to 5.11.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.11.0...5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-16 04:19:44 +00:00
dependabot-preview[bot]
4f66f2674e
build(deps): bump metascraper-date from 5.9.5 to 5.10.3 in /backend 
Bumps [metascraper-date](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-16 04:19:09 +00:00
mattwr18
9e639c23a7 Fix import for newly named/moved component 2020-01-15 18:20:12 +01:00
mattwr18
81cbb7a85c Refactor styling, fix naming convention 
- Emotions buttons were not displaying images correctly
- Follow vue guidelines for multiword naming convention
- Favor tokens over magic px numbers
 2020-01-15 17:37:54 +01:00
Alina Beck
eaf738c12b replace last instance of ds-button with base-button 2020-01-15 16:13:47 +03:00
Alina Beck
fcbe6125f3 refactor and use base-button in SearchableInput 2020-01-15 16:04:27 +03:00
mattwr18
c576e7fd81
Merge pull request #2754 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.8.3 
build(deps-dev): bump @babel/node from 7.8.0 to 7.8.3 in /backend
 2020-01-15 13:26:41 +01:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
dependabot-preview[bot]
00e2672e57
build(deps-dev): bump @babel/node from 7.8.0 to 7.8.3 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.8.0 to 7.8.3.
- [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.8.0...v7.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 11:17:49 +00:00
Alina Beck
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons 
refactor(styleguide): migrate and redesign buttons
 2020-01-15 14:17:06 +03:00
Robert Schäfer
f569efa5ad
Merge pull request #2760 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.8.3 
build(deps-dev): bump @babel/core from 7.8.0 to 7.8.3 in /backend
 2020-01-15 12:15:45 +01:00
mattwr18
661bb9f7cd
Merge pull request #2782 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.3 
build(deps-dev): bump @storybook/addon-actions from 5.3.2 to 5.3.3 in /webapp
 2020-01-15 11:40:32 +01:00
Alina Beck
c108603b8f fix tests and refactor Paginate component 2020-01-15 13:09:36 +03:00
Alina Beck
7c89404da0 fix lint errors in test 2020-01-15 12:15:03 +03:00
dependabot-preview[bot]
428d99aca3
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.2 to 5.3.3.
- [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.3/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 09:06:39 +00:00
dependabot-preview[bot]
5822b1b999
build(deps-dev): bump @babel/core from 7.8.0 to 7.8.3 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.0 to 7.8.3.
- [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.8.0...v7.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 09:06:03 +00:00
mattwr18
fe86391712
Merge pull request #2781 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-8.0.2 
build(deps-dev): bump sass-loader from 8.0.0 to 8.0.2 in /webapp
 2020-01-15 10:04:46 +01:00
mattwr18
efe000de51
Merge pull request #2780 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/plugin-syntax-dynamic-import-7.8.3 
build(deps-dev): bump @babel/plugin-syntax-dynamic-import from 7.8.0 to 7.8.3 in /webapp
 2020-01-15 10:04:26 +01:00
mattwr18
074ca1b213
Merge pull request #2779 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.3 
build(deps-dev): bump @storybook/addon-a11y from 5.3.2 to 5.3.3 in /webapp
 2020-01-15 10:04:05 +01:00
mattwr18
26874f837e
Merge pull request #2778 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.10.2 
build(deps): bump metascraper from 5.9.5 to 5.10.2 in /backend
 2020-01-15 10:03:46 +01:00
Alina Beck
150d04080b follow @mattwr18 code review 2020-01-15 11:55:27 +03:00
Alina Beck
f53bcba13c use EmotionButton in filter menu 2020-01-15 11:42:12 +03:00