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

2911 Commits

Author SHA1 Message Date
dependabot-preview[bot]
2b52d7599c
build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.9.0...v25.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 14:22:28 +00:00
Wolfgang Huß
58a120d3d7 Clean up 2020-01-22 15:13:13 +01:00
dependabot-preview[bot]
8f88d03239
build(deps-dev): bump @storybook/vue from 5.3.7 to 5.3.8 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) 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/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 13:07:47 +00:00
dependabot-preview[bot]
dff9f6ea84
build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 13:07:23 +00:00
Wolfgang Huß
1c0d54a935 Fix lint 2020-01-22 13:34:52 +01:00
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
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
ogerly
21fa211e0c test: specs not ok, lint is ok 2020-01-22 11:31:23 +01:00
ogerly
00c0397919 test: specs is not ok 2020-01-22 11:25:44 +01:00
Wolfgang Huß
4c6c3b8b27 Change the class 'text-notification-header' 2020-01-22 10:55:15 +01:00
dependabot-preview[bot]
f158e3e596
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.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/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-22 09:21:05 +00: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
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
2df4e463f8 Update/Add translations for placeholder message 
- @alina-beck, I had a look at the Placeholder component and it's quite
  simple, but I guess migrating that is a separate PR, but I don't know
aobut adding more ds-placeholders, do you have some design ideas on what
could look better?
 2020-01-21 19:28:19 +01:00
mattwr18
c7ee90e980 Follow @roschaefer PR suggestions 
- As blocking is now reciprocal, we do not need another query, we can
  use neo4j-graphql-js magic to query for a BLOCKED relationship between
the postAuthor and the currentUser
 2020-01-21 18:50:46 +01: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
ogerly
73b005a900 test: added some test 2020-01-20 11:18:35 +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