ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-19 19:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,445 Commits 104 Branches 1,559 Tags
Commit Graph

3244 Commits

Author SHA1 Message Date
Wolfgang Huß
cb1ab0cdbb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 2020-04-09 11:45:11 +02:00
Wolfgang Huß
afe2c74bba Cleanup 2020-04-09 11:41:40 +02:00
Wolfgang Huß
7478b788a6 Cleanup 2020-04-09 08:18:03 +02:00
Wolfgang Huß
c1af486de4 Fix locales 2020-04-08 16:30:08 +02:00
Wolfgang Huß
db7908139c Cleanup 2020-04-08 15:56:27 +02:00
mattwr18
941dd97592
Merge pull request #3446 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.3.1 
build(deps-dev): bump @vue/cli-shared-utils from 4.3.0 to 4.3.1 in /webapp
 2020-04-08 15:11:58 +02:00
dependabot-preview[bot]
34a856a98f
build(deps-dev): bump css-loader from 3.5.0 to 3.5.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.0...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-08 04:23:52 +00:00
dependabot-preview[bot]
ce79747cc5
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.3.0 to 4.3.1.
- [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.3.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-08 04:22:44 +00:00
mattwr18
ca5c1a5516 chore: update variable to avoid validation error 
- test was throwing a validation error for count as searchResults was
  setting commentCount instead of commentsCount
 2020-04-07 15:41:47 +02:00
Alina Beck
797efe0a60 use CounterIcon component to show counts 
- also adds a 'soft' variant to CounterIcon to make it more adaptable
 2020-04-07 15:41:47 +02:00
mattwr18
668159fa5e fix(frontend): update tests with new CSS selectors 2020-04-07 15:41:45 +02:00
mattwr18
ff44fdb12c refactor: favor CSS over syleguide components 2020-04-07 15:41:06 +02:00
mattwr18
5cc3ef5faa
Merge pull request #3411 from Human-Connection/remove-unused-package 
chore: removed unused fuse.js
 2020-04-07 15:20:22 +02:00
dependabot-preview[bot]
f8f9e6185f
build(deps-dev): bump css-loader from 3.4.2 to 3.5.0 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.2...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-07 04:24:24 +00:00
Wolfgang Huß
ad4e252c67 Fix locales 2020-04-06 15:56:30 +02:00
dependabot-preview[bot]
f4744dc36a
build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.2...2.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 12:52:15 +00:00
mattwr18
4397f70642
Merge pull request #3422 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook-design-token-0.7.2 
build(deps-dev): bump storybook-design-token from 0.7.0 to 0.7.2 in /webapp
 2020-04-06 14:49:11 +02:00
mattwr18
8654b2cea0
Merge pull request #3424 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-4.0.0 
build(deps-dev): bump eslint-loader from 3.0.3 to 4.0.0 in /webapp
 2020-04-06 13:07:31 +02:00
Wolfgang Huß
f4b90a449e Fix Cypress test for notification on Build 2020-04-06 10:12:04 +02:00
dependabot-preview[bot]
1359cafcd0
build(deps-dev): bump eslint-loader from 3.0.3 to 4.0.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.3 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.3...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 04:28:41 +00:00
dependabot-preview[bot]
fd705d057a
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.2.3 to 4.3.0.
- [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.3.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 04:28:03 +00:00
dependabot-preview[bot]
fe45e6f253
build(deps-dev): bump storybook-design-token in /webapp 
Bumps [storybook-design-token](https://github.com/UX-and-I/storybook-design-token) from 0.7.0 to 0.7.2.
- [Release notes](https://github.com/UX-and-I/storybook-design-token/releases)
- [Commits](https://github.com/UX-and-I/storybook-design-token/compare/v0.7.0...v0.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-06 04:27:31 +00:00
dependabot-preview[bot]
421276c06b
build(deps-dev): bump jest from 25.2.4 to 25.2.7 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 25.2.4 to 25.2.7.
- [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/v25.2.4...v25.2.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-03 18:53:01 +00:00
Wolfgang Huß
5f9156c750 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 2020-04-03 15:39:59 +02:00
Wolfgang Huß
b417667d31 Rename return property of 'extractNotificationDataOfCurrentUser' 
- Renamed 'report' to 'filedReport'.
- Commented on the need of deep nested and similair properties for GQL of notifications.
 2020-04-03 15:25:07 +02:00
Wolfgang Huß
2697408b65 Fix Cypress test for notifications 2020-04-03 14:46:13 +02:00
Wolfgang Huß
f8de595d3b Extent storybook NotificationsTable with filed report notifications 2020-04-03 13:43:42 +02:00
mattwr18
88030b80bf
Merge pull request #3407 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook-design-token-0.7.0 
build(deps-dev): bump storybook-design-token from 0.5.1 to 0.7.0 in /webapp
 2020-04-03 11:49:22 +02:00
mattwr18
3b9e224681 chore: removed unused fuje.js 2020-04-03 11:47:58 +02:00
mattwr18
d8ebaf655d
Merge pull request #3403 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-25.2.6 
build(deps-dev): bump babel-jest from 25.2.3 to 25.2.6 in /webapp
 2020-04-03 11:42:52 +02:00
Wolfgang Huß
ff27a89579 Prettify notifications table 2020-04-03 09:34:15 +02:00
Wolfgang Huß
c574c58ad5 Refactor notifications menu 2020-04-03 09:27:12 +02:00
Wolfgang Huß
6f8b48024d Fix Cypher for notifications queries 
- Fixed GQL queries for notifications – normal, aerkAsRead, subscriptions add.
- Refactored notifications tests to check for authors of all types.
 2020-04-03 08:59:17 +02:00
dependabot-preview[bot]
e12c42315f
build(deps-dev): bump babel-jest from 25.2.3 to 25.2.6 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.3 to 25.2.6.
- [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.2.6/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-03 06:25:33 +00:00
dependabot-preview[bot]
01efa265df
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.1 to 0.7.0.
- [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.1...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-03 04:22:13 +00:00
dependabot-preview[bot]
2ab96d8c08
build(deps): bump tiptap-extensions from 1.28.7 to 1.28.8 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.7 to 1.28.8.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.7...tiptap-extensions@1.28.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-03 04:20:11 +00:00
Wolfgang Huß
4659133104 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 2020-04-02 10:59:28 +02:00
dependabot-preview[bot]
2fdc645402
build(deps): bump tiptap-extensions from 1.28.6 to 1.28.7 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.6 to 1.28.7.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.6...tiptap-extensions@1.28.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-02 04:20:40 +00:00
Wolfgang Huß
d0cf1cc185 Fix lint 2020-04-01 15:53:57 +02:00
Robert Schäfer
402337f56b
Merge pull request #3387 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.18 
build(deps-dev): bump @storybook/vue from 5.3.17 to 5.3.18 in /webapp
 2020-04-01 15:12:52 +02:00
Wolfgang Huß
0d690e1a6a Merge branch '3389-refactor-searches-unit-tests-to-return-errors' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 2020-04-01 14:45:43 +02:00
dependabot-preview[bot]
a43d10238c
build(deps-dev): bump @storybook/vue from 5.3.17 to 5.3.18 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.17 to 5.3.18.
- [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.18/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-01 11:20:47 +00:00
dependabot-preview[bot]
b51896dcc9
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.17 to 5.3.18.
- [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.18/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-01 11:20:42 +00:00
Wolfgang Huß
a52cbe1c66 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 
# Conflicts:
#	backend/src/db/seed.js
#	backend/src/middleware/notifications/notificationsMiddleware.js
#	backend/src/schema/resolvers/notifications.js
#	webapp/components/NotificationsTable/NotificationsTable.spec.js
 2020-04-01 12:22:56 +02:00
dependabot-preview[bot]
ce3aeab264
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.17 to 5.3.18.
- [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.18/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-01 05:59:33 +00:00
dependabot-preview[bot]
93f43e2665
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.17 to 5.3.18.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.18/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.18/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-01 04:18:29 +00:00
Robert Schäfer
0d2980bc8d
Merge pull request #3370 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.20.2 
build(deps-dev): bump eslint-plugin-import from 2.20.1 to 2.20.2 in /webapp
 2020-03-31 16:20:15 +02:00
dependabot-preview[bot]
73aeeaca17
build(deps): bump @nuxtjs/axios from 5.9.6 to 5.9.7 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.6 to 5.9.7.
- [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.6...v5.9.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-31 04:19:10 +00:00
dependabot-preview[bot]
529ba0178b
build(deps-dev): bump eslint-plugin-import in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.1 to 2.20.2.
- [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.1...v2.20.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-30 20:17:11 +00:00
Robert Schäfer
87e050078e
Merge pull request #3373 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-25.2.4 
build(deps-dev): bump jest from 25.2.3 to 25.2.4 in /webapp
 2020-03-30 22:09:48 +02:00