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

2866 Commits

Author SHA1 Message Date
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
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
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
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
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
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
mattwr18
3f3634210a
Merge pull request #2913 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.9 
build(deps-dev): bump @storybook/vue from 5.3.8 to 5.3.9 in /webapp
 2020-01-27 16:36:47 +01:00
mattwr18
8561d28adf
Merge pull request #2905 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.6.0 
build(deps): bump graphql from 14.5.8 to 14.6.0 in /webapp
 2020-01-27 15:11:05 +01:00
dependabot-preview[bot]
9fe83b4a49
build(deps-dev): bump @storybook/vue from 5.3.8 to 5.3.9 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) 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/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 14:00:59 +00:00
mattwr18
ca276f24e6
Merge pull request #2910 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.9 
build(deps-dev): bump @storybook/addon-notes from 5.3.8 to 5.3.9 in /webapp
 2020-01-27 14:58:22 +01:00
dependabot-preview[bot]
ee3718f0f1
build(deps): bump graphql from 14.5.8 to 14.6.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.8 to 14.6.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.8...v14.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 11:38:23 +00:00
mattwr18
983e846d54
Merge pull request #2916 from Human-Connection/dependabot/npm_and_yarn/webapp/cross-env-7.0.0 
build(deps): bump cross-env from 6.0.3 to 7.0.0 in /webapp
 2020-01-27 12:36:04 +01:00
dependabot-preview[bot]
bfba2c7993
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.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/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 09:53:49 +00:00
mattwr18
bade898914
Merge pull request #2915 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook-design-token-0.5.1 
build(deps-dev): bump storybook-design-token from 0.5.0 to 0.5.1 in /webapp
 2020-01-27 10:52:43 +01:00
mattwr18
215770cac9
Merge pull request #2912 from Human-Connection/dependabot/npm_and_yarn/webapp/validator-12.2.0 
build(deps): bump validator from 12.1.0 to 12.2.0 in /webapp
 2020-01-27 10:52:10 +01:00
dependabot-preview[bot]
c8e7aab4c3
build(deps): bump cross-env from 6.0.3 to 7.0.0 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.0.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 09:52:06 +00:00
dependabot-preview[bot]
b51ddde470
build(deps-dev): bump storybook-design-token in /webapp 
Bumps [storybook-design-token](https://github.com/UX-and-I/storybook-design-token) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/UX-and-I/storybook-design-token/releases)
- [Commits](https://github.com/UX-and-I/storybook-design-token/compare/v0.5.0...v0.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 04:21:08 +00:00
dependabot-preview[bot]
287ed2698f
build(deps): bump validator from 12.1.0 to 12.2.0 in /webapp 
Bumps [validator](https://github.com/chriso/validator.js) from 12.1.0 to 12.2.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.1.0...12.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 04:19:34 +00:00
dependabot-preview[bot]
578d2875a7
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.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/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 04:18:13 +00:00
roschaefer
789c40c34e feat(editor): Underline markup for posts+comments 
We had tiptap's underline and never used it. A user has asked for it, so
why not implement it right away?

Suggested by `@raimundo@human-connection.social`:
https://human-connection.social/post/612bf465-91ce-4be8-906e-3bde63617346/hcsocial-dein-netzwerk-news-mit-dennis-and-robert-1#commentId-b864d04f-1e8c-48c4-9ed0-98aefaed1c02
 2020-01-26 20:39:52 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature 
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2020-01-23 20:30:12 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock 
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
 2020-01-23 19:18:12 +01:00
mattwr18
2177f5e139
Merge pull request #2868 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-25.1.0 
build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /webapp
 2020-01-22 22:35:00 +01:00
mattwr18
07797d8f87
Merge pull request #2867 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.8 
build(deps-dev): bump @storybook/vue from 5.3.7 to 5.3.8 in /webapp
 2020-01-22 22:34:09 +01:00
Alina Beck
7c090cc3ed set z-index for UserTeaser only on PostCard 2020-01-22 18:09:44 +03:00
Alina Beck
0392826211 set avatar size to small in AvatarMenu and for Anonymous users 2020-01-22 18:05:00 +03:00
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
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
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
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