ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-15 09:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,312 Commits 101 Branches 1,536 Tags
Commit Graph

2838 Commits

Author SHA1 Message Date
Wolfgang Huß
0bb2b905ee Add example notification for filed report to storybook 2020-01-22 13:32:54 +01:00
Wolfgang Huß
e563887022 Fix test in 'NotificationsTable.spec.js' for new 'user-teaser' component 2020-01-22 13:17:11 +01:00
Wolfgang Huß
71cf2a397a Modify layout of notifications menu 2020-01-22 13:02:54 +01:00
Wolfgang Huß
4c6c3b8b27 Change the class 'text-notification-header' 2020-01-22 10:55:15 +01:00
Wolfgang Huß
2d73a54819 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 
# Conflicts:
#	webapp/components/Notification/Notification.vue
#	webapp/components/NotificationsTable/NotificationsTable.vue
 2020-01-22 10:12:35 +01:00
mattwr18
dfe149c8cf
Merge pull request #2866 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.8 
build(deps-dev): bump @storybook/addon-a11y from 5.3.7 to 5.3.8 in /webapp
 2020-01-22 09:44:15 +01:00
dependabot-preview[bot]
70f4491238
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.7 to 5.3.8.
- [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.8/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 04:21:18 +00:00
dependabot-preview[bot]
d6b78e4794
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.7 to 5.3.8.
- [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.8/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 04:20:09 +00:00
mattwr18
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content 
feat: Convert block/unblock to mute/unmute
 2020-01-21 17:05:09 +01:00
Alina Beck
24898f5fe2 quick fix tests relying on classes of child components 
changing class names in the UserTeaser leads to tests failing for other components, like SearchableInput and NotificationsTable – I just updated the classes but long-term it would be good to find a way to not rely on implementation details of child components – maybe just test if the child component is rendered?
 2020-01-21 17:07:00 +03:00
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +03:00
Alina Beck
e93332b173 display username below slug when there is no date-time 2020-01-21 17:00:20 +03:00
Mogge
bdb729b461 removed obsolete German keys (#2845) 2020-01-21 13:15:19 +01:00
dependabot-preview[bot]
3b24ae3d85 build(deps-dev): bump @vue/server-test-utils in /webapp (#2852) 
Bumps [@vue/server-test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/server-test-utils) from 1.0.0-beta.30 to 1.0.0-beta.31.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/server-test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.31/packages/server-test-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 13:14:26 +01:00
dependabot-preview[bot]
bf08d2f9fb build(deps-dev): bump @storybook/vue from 5.3.6 to 5.3.7 in /webapp (#2857) 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.6 to 5.3.7.
- [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.7/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 13:13:13 +01:00
dependabot-preview[bot]
8142bf132c build(deps-dev): bump @storybook/addon-a11y in /webapp (#2858) 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.6 to 5.3.7.
- [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.7/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 13:12:48 +01:00
Alina Beck
d20421cb70 clean up UserAvatar a little 2020-01-21 13:26:14 +03:00
Alina Beck
c5af2dbfb4 truncate overflowing user name 2020-01-21 11:58:54 +03:00
mattwr18
66564583c5
Merge pull request #2856 from Human-Connection/dependabot/npm_and_yarn/webapp/v-tooltip-2.0.3 
build(deps): bump v-tooltip from 2.0.2 to 2.0.3 in /webapp
 2020-01-21 09:26:55 +01:00
mattwr18
49773fb594
Merge pull request #2855 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.7 
build(deps-dev): bump @storybook/addon-notes from 5.3.6 to 5.3.7 in /webapp
 2020-01-21 09:26:11 +01:00
dependabot-preview[bot]
cb583e5285
build(deps): bump v-tooltip from 2.0.2 to 2.0.3 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.2...v2.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 04:21:08 +00:00
dependabot-preview[bot]
166081ebfc
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.6 to 5.3.7.
- [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.7/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 04:20:36 +00:00
dependabot-preview[bot]
2bb707598f
build(deps-dev): bump @vue/test-utils in /webapp 
Bumps [@vue/test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/test-utils) from 1.0.0-beta.30 to 1.0.0-beta.31.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.31/packages/test-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-21 04:19:21 +00:00
Wolfgang Huß
4ca18522f1 Implement the filed report notification on the notification page 
- Get all the old tests running.
- Implement new necessary tests.
- Lint fixing.
 2020-01-20 18:03:40 +01:00
mattwr18
2bcdf21429
Merge pull request #2844 from Human-Connection/release_0.2.2 
Release 0.2.2
 2020-01-20 17:21:18 +01:00
dependabot-preview[bot]
ce98a0024a build(deps-dev): bump @storybook/addon-actions in /webapp (#2842) 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.5 to 5.3.7.
- [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.7/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 16:33:16 +01:00
roschaefer
7e26e56654 chore(release): 0.2.2 2020-01-20 15:26:09 +01:00
Wolfgang Huß
48403471d5 Add tests in Notification.spec.js 2020-01-20 10:29:46 +01:00
mattwr18
7b73c990ec Remove unintended changes to class name/comment 2020-01-20 10:19:39 +01:00
mattwr18
1da872ba1e Update SearchableInput spec after rebase 2020-01-20 10:11:48 +01:00
mattwr18
74a7db5388 Convert missed ds-avatar, fix cypress test 2020-01-20 10:08:27 +01:00
mattwr18
77ef3b0406 Fix failing tests 2020-01-20 10:07:02 +01:00
mattwr18
2cc350936f Update HcUser to UserTeaser 2020-01-20 10:06:31 +01:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions 
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-01-20 10:04:30 +01:00
mattwr18
5c7a6ace08 Refactor 
- Move mouse events to nuxt-link
- use .native
- refactor deprecated slot syntax
 2020-01-20 10:04:30 +01:00
mattwr18
27c23fa9ac Improve styling of User.vue 
- Remove avatar class
- fix competing styles
- follow rscss guidlines
 2020-01-20 10:04:30 +01:00
mattwr18
905f34c827 Support use of initials, add tests, move component 
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
 2020-01-20 10:04:30 +01:00
mattwr18
068e2b4417 Fix styling, renaming classes 2020-01-20 10:04:30 +01:00
mattwr18
b090b1177f Migrate the bare minimum 
- follow @alina-beck PR review
 2020-01-20 10:04:30 +01:00
Wolfgang Huß
23626fdaf5 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-01-20 09:31:19 +01: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
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
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
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]
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]
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]
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