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

2919 Commits

Author SHA1 Message Date
mattwr18
5347f734af Fix cypress tests/frontend implementation 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-02-10 16:25:00 +01:00
mattwr18
3b29d480e3 Display unblock feature only for blocking user 
- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
 2020-02-10 12:34:40 +01:00
dependabot-preview[bot]
e8410a62dc build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.1.2 to 4.2.2.
- [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/v4.2.2/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:31:28 +00:00
Robert Schäfer
a9b7318874
Merge pull request #2826 from Human-Connection/error-pages 
fix: Error pages can be translated
 2020-02-07 11:59:33 +01:00
dependabot-preview[bot]
9241c6f5db
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.10 to 5.3.12.
- [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.12/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 12:41:57 +00:00
dependabot-preview[bot]
13644faf79
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.10 to 5.3.12.
- [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.12/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 10:07:06 +00:00
dependabot-preview[bot]
b0ebb0c0d6
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.10 to 5.3.12.
- [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.12/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 08:00:04 +00:00
dependabot-preview[bot]
7aa1baae9f
build(deps-dev): bump @storybook/vue from 5.3.10 to 5.3.12 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.10 to 5.3.12.
- [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.12/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 04:21:15 +00:00
mattwr18
fd21de48de
Merge pull request #2951 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.10 
build(deps-dev): bump @storybook/addon-notes from 5.3.9 to 5.3.10 in /webapp
 2020-02-05 00:28:29 +01:00
dependabot-preview[bot]
6b6c913194
build(deps): bump @nuxtjs/sentry from 3.1.0 to 3.2.2 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.1.0 to 3.2.2.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.1.0...v3.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 08:33:57 +00:00
dependabot-preview[bot]
75137ce716
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.9 to 5.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.10/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 08:33:20 +00:00
mattwr18
4a91e3e82e
Merge pull request #2959 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/pwa-3.0.0-beta.20 
build(deps): bump @nuxtjs/pwa from 3.0.0-beta.19 to 3.0.0-beta.20 in /webapp
 2020-02-04 09:31:23 +01:00
mattwr18
eae1c12fa6
Merge pull request #2956 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.10 
build(deps-dev): bump @storybook/addon-a11y from 5.3.9 to 5.3.10 in /webapp
 2020-02-04 09:30:40 +01:00
mattwr18
3a636e93c8
Merge pull request #2949 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.20.1 
build(deps-dev): bump eslint-plugin-import from 2.20.0 to 2.20.1 in /webapp
 2020-02-04 09:28:39 +01:00
dependabot-preview[bot]
0bb2e32781
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.9 to 5.3.10.
- [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.10/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 00:35:50 +00:00
dependabot-preview[bot]
54f3b62901
build(deps-dev): bump eslint-plugin-import in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.0 to 2.20.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.20.0...v2.20.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 00:34:50 +00:00
dependabot-preview[bot]
a7b6d82cda
build(deps-dev): bump @storybook/addon-actions in /webapp (#2953) 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.9 to 5.3.10.
- [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.10/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 01:33:13 +01:00
dependabot-preview[bot]
42df140672
build(deps): bump @nuxtjs/pwa in /webapp 
Bumps [@nuxtjs/pwa](https://github.com/nuxt-community/pwa-module) from 3.0.0-beta.19 to 3.0.0-beta.20.
- [Release notes](https://github.com/nuxt-community/pwa-module/releases)
- [Changelog](https://github.com/nuxt-community/pwa-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/pwa-module/compare/v3.0.0-beta.19...v3.0.0-beta.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 00:33:02 +00:00
dependabot-preview[bot]
5097c41cec
build(deps-dev): bump @storybook/vue from 5.3.9 to 5.3.10 in /webapp (#2961) 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.9 to 5.3.10.
- [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.10/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 01:30:37 +01:00
dependabot-preview[bot]
6c15d6cf09
build(deps): bump @nuxtjs/axios from 5.9.4 to 5.9.5 in /webapp (#2962) 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.4 to 5.9.5.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.4...v5.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 01:30:20 +01:00
mattwr18
335e7127b8 Update mute/unmute icon to unused icon 
- we are already using eye/eye-slash for disable/release
 2020-02-03 21:14:38 +01:00
mattwr18
34ec61153a
Fix typo (#2966) 2020-02-03 15:06:08 +01:00
dependabot-preview[bot]
367084155b
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /webapp (#2939) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 18:29:10 +01:00
mattwr18
c8c71a52c6 Follow @Tirokk PR review suggestions 
- Favor lowercase for words in a sentence after the first
- Use exclamation marks for successful actions that use a toastr
- place events at the end of the list on components
- place class above events
- it would be nice to come to a consensus based on best practices, like
  I had a doubt and places the class definition below the props, is that
what others do?
 2020-01-31 13:09:37 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
mattwr18
44250d2f66
Merge pull request #2932 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /webapp
 2020-01-31 12:42:06 +01:00
dependabot-preview[bot]
d5b664ece4
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:44:28 +00:00
dependabot-preview[bot]
30e77c38ec
build(deps): bump @nuxtjs/axios from 5.9.3 to 5.9.4 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.3 to 5.9.4.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.3...v5.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:21:28 +00:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
mattwr18
16185ce03e
Merge pull request #2925 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.1 
build(deps): bump cookie-universal-nuxt from 2.1.0 to 2.1.1 in /webapp
 2020-01-30 09:40:06 +01:00
dependabot-preview[bot]
00a644996f
build(deps): bump @nuxtjs/sentry from 3.0.1 to 3.1.0 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.1...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-30 04:18:54 +00:00
Moriz Wahl
30b90478a1 cypress test is passing again 2020-01-29 10:57:45 +01:00
dependabot-preview[bot]
01aa015960
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.9.0 to 6.10.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.9.0...v6.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 09:03:48 +00:00
Moriz Wahl
b513da9756 spec is running again 2020-01-29 10:03:01 +01:00
dependabot-preview[bot]
277fd4d9dd
build(deps): bump cookie-universal-nuxt from 2.1.0 to 2.1.1 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.0...v2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 04:21:36 +00:00
Robert Schäfer
65811e2d8b
Merge pull request #2898 from Human-Connection/add_underline_menu_button 
feat(editor): Underline markup for posts+comments
 2020-01-28 22:34:30 +01:00
Moriz Wahl
d20c94b453 Image size reduced 2020-01-28 22:26:54 +01:00
Moriz Wahl
d4e496b9e6 error image rendered 2020-01-28 21:48:22 +01:00
Moriz Wahl
31790a9ebc Imported images from https://github.com/Human-Connection/WebApp/blob/develop/static/assets/svg/errors/ 2020-01-28 21:45:01 +01:00
mattwr18
c2764e5565
Merge pull request #2914 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.9 
build(deps-dev): bump @storybook/addon-a11y from 5.3.8 to 5.3.9 in /webapp
 2020-01-28 11:35:43 +01:00
Moriz Wahl
7315cacb5a Text for 403 error is localized 
I hacked the error.vue to catch the default 404 error message and to display a localized message instead. I found no better way to do it. Any ideas?
 2020-01-28 10:18:15 +01:00
Moriz Wahl
a4907f2bcb localised error message for cannot edit post 2020-01-28 10:18:15 +01:00
Moriz Wahl
9948f4ef20 improved layout, key-name changed 2020-01-28 10:18:15 +01:00
Moriz Wahl
7cfd61ecf2 Error page added 2020-01-28 10:18:15 +01:00
mattwr18
abeb2e97ed
Merge pull request #2871 from Human-Connection/fix-avatar-issues 
fix(webapp): 🐛 Adjust Avatar Sizes and 'z-index'
 2020-01-28 01:09:55 +01:00
mattwr18
d6a2f2d9e3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-27 20:08:37 +01:00
Alina Beck
c74eebfcdc use $event instead of event in vue template 2020-01-27 19:25:46 +01:00
Alina Beck
73a1d54915 remove z-index from UserAvatar 2020-01-27 19:17:22 +01:00
dependabot-preview[bot]
3a67361dbd
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.8 to 5.3.9.
- [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.9/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 15:39:32 +00:00