6495 Commits

Author SHA1 Message Date
mattwr18
fee7f9ff12
Merge pull request #1872 from Human-Connection/1733-fix
🍰 Fix - maintaining sorting after navigation
2019-10-22 12:47:18 +02:00
mattwr18
98e3bb40d5
Merge pull request #1906 from Human-Connection/add_storybook_stories_for_our_university_students
Add storybook stories for our university students
2019-10-22 11:58:17 +02:00
mattwr18
da08e20af5
Merge pull request #1987 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.10.2
build(deps): bump nuxt from 2.10.1 to 2.10.2 in /webapp
2019-10-22 11:18:38 +02:00
mattwr18
9f3e6676fb
Merge pull request #1981 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.5
build(deps-dev): bump @storybook/vue from 5.2.4 to 5.2.5 in /webapp
2019-10-22 11:17:40 +02:00
mattwr18
c60e6df6d7
Merge pull request #1978 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.20.0
build(deps-dev): bump eslint-plugin-jest from 22.17.0 to 22.20.0 in /backend
2019-10-22 11:16:24 +02:00
mattwr18
73016453ac
Merge pull request #1977 from Human-Connection/dependabot/docker/webapp/node-12.13.0-alpine
build(deps): bump node from 12.12.0-alpine to 12.13.0-alpine in /webapp
2019-10-22 11:15:41 +02:00
mattwr18
219ce48646
Merge pull request #1962 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.5.1
build(deps-dev): bump date-fns from 2.5.0 to 2.5.1
2019-10-22 11:13:26 +02:00
mattwr18
608c266831
Merge pull request #1961 from Human-Connection/dependabot/npm_and_yarn/backend/faker-9fd8d7d
build(deps): bump faker from `10bfb9f` to `9fd8d7d` in /backend
2019-10-22 11:12:59 +02:00
mattwr18
b92fbbaa85
Merge pull request #1920 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.0
build(deps-dev): bump async-validator from 3.1.0 to 3.2.0 in /webapp
2019-10-22 11:12:29 +02:00
mattwr18
e41ca82b00
Merge pull request #1914 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.7.1
build(deps): bump @sentry/node from 5.7.0 to 5.7.1 in /backend
2019-10-22 11:11:55 +02:00
mattwr18
333b38d1b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1733-fix 2019-10-22 11:07:29 +02:00
mattwr18
d87f9c8a1b
Merge pull request #1973 from Human-Connection/1970-hide-new-comment-form-while-editing-other-comments
Hide new CommentForm while editing a comment
2019-10-22 11:01:31 +02:00
mattwr18
b76a06d478
Merge pull request #1972 from Human-Connection/1971-german-translations-for-pin-post-missing
🍰 Translate texts for pinning a post to German
2019-10-22 11:01:12 +02:00
dependabot-preview[bot]
d88ad6cbb1
build(deps): bump nuxt from 2.10.1 to 2.10.2 in /webapp
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.10.1...v2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 04:28:48 +00:00
dependabot-preview[bot]
45dc6d2fcf
build(deps-dev): bump @storybook/vue from 5.2.4 to 5.2.5 in /webapp
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.4 to 5.2.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.2.5/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 04:26:40 +00:00
dependabot-preview[bot]
678f9956de
build(deps-dev): bump eslint-plugin-jest in /backend
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.20.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.17.0...v22.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 04:25:34 +00:00
dependabot-preview[bot]
065dbcf50a
build(deps): bump node from 12.12.0-alpine to 12.13.0-alpine in /webapp
Bumps node from 12.12.0-alpine to 12.13.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 04:25:00 +00:00
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
Wolfgang Huß
736e7cc903 Translate texts for pinning a post to German 2019-10-21 16:03:09 +02:00
mattwr18
46fd534a28
Merge pull request #1840 from Human-Connection/1205-pinned-post-for-admins
Allow admins to pin a post
2019-10-21 14:37:14 +02:00
Alina Beck
c2c69a2f70 update styling and wording for pinned post ribbons 2019-10-21 14:34:26 +03:00
Robert Schäfer
59e3d62bf8
Merge pull request #1968 from Human-Connection/1893-fix
fix: Only one ellipse is displayed
2019-10-21 13:28:12 +02:00
mattwr18
9d37099984
Merge pull request #1957 from Human-Connection/1955_refactor-reports-resolver-spec
Refactor reports resolver spec
2019-10-21 13:22:17 +02:00
aonomike
86907f2800 Fix code review issues 2019-10-21 13:25:56 +03:00
Mogge
8728feaa37
fix: Only one ellipse is displayed 2019-10-21 11:33:26 +02:00
mattwr18
3163f6c9b1
Merge pull request #1853 from Human-Connection/219-add-createDate-follow-shout
Added createdAt date for follow and shout
2019-10-21 10:13:20 +02:00
mattwr18
3a78af3efb
Merge pull request #1965 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.0.4
build(deps-dev): bump @vue/cli-shared-utils from 3.12.0 to 4.0.4 in /webapp
2019-10-21 09:42:43 +02:00
dependabot-preview[bot]
e3b91780c3
build(deps-dev): bump date-fns from 2.5.0 to 2.5.1
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 07:41:17 +00:00
mattwr18
945c2447d8
Merge pull request #1963 from Human-Connection/dependabot/docker/neo4j/neo4j-3.5.12-enterprise
build(deps): bump neo4j from 3.5.11-enterprise to 3.5.12-enterprise in /neo4j
2019-10-21 09:40:52 +02:00
dependabot-preview[bot]
20e3ec1965
build(deps): bump faker from 10bfb9f to 9fd8d7d in /backend
Bumps [faker](https://github.com/Marak/faker.js) from `10bfb9f` to `9fd8d7d`.
- [Release notes](https://github.com/Marak/faker.js/releases)
- [Commits](10bfb9f467...9fd8d7d37b)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 07:40:49 +00:00
dependabot-preview[bot]
7adeade193
build(deps-dev): bump async-validator from 3.1.0 to 3.2.0 in /webapp
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/commits/v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 07:40:38 +00:00
mattwr18
38ffa86c24
Merge pull request #1960 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.4.0
build(deps-dev): bump cypress-file-upload from 3.3.4 to 3.4.0
2019-10-21 09:40:12 +02:00
mattwr18
797520aaef
Merge pull request #1959 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.5.1
build(deps): bump date-fns from 2.5.0 to 2.5.1 in /backend
2019-10-21 09:39:33 +02:00
dependabot-preview[bot]
8317348e58
build(deps): bump @sentry/node from 5.7.0 to 5.7.1 in /backend
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.7.0...5.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 07:39:17 +00:00
mattwr18
9a9768616c
Merge pull request #1958 from Human-Connection/dependabot/npm_and_yarn/faker-9fd8d7d
build(deps-dev): bump faker from `10bfb9f` to `9fd8d7d`
2019-10-21 09:38:58 +02:00
dependabot-preview[bot]
fa5ce6edca
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 3.12.0 to 4.0.4.
- [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.0.4/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 04:24:49 +00:00
dependabot-preview[bot]
484917d922
build(deps): bump neo4j in /neo4j
Bumps neo4j from 3.5.11-enterprise to 3.5.12-enterprise.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 04:23:31 +00:00
dependabot-preview[bot]
03b75bea6c
build(deps-dev): bump cypress-file-upload from 3.3.4 to 3.4.0
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.4 to 3.4.0.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.4...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 04:22:33 +00:00
dependabot-preview[bot]
f6099e838b
build(deps): bump date-fns from 2.5.0 to 2.5.1 in /backend
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 04:22:09 +00:00
dependabot-preview[bot]
3ea174a42f
build(deps-dev): bump faker from 10bfb9f to 9fd8d7d
Bumps [faker](https://github.com/Marak/faker.js) from `10bfb9f` to `9fd8d7d`.
- [Release notes](https://github.com/Marak/faker.js/releases)
- [Commits](10bfb9f467...9fd8d7d37b)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 04:21:40 +00:00
Kapil Jain
aaa1fea582 Implemented review comments - moved new tests in their own 'it' blocks. 2019-10-20 11:12:54 -04:00
Kapil Jain
58e3429c31 Implemented review comments - moved new tests in their own 'it' blocks. 2019-10-20 10:52:20 -04:00
aonomike
4e42017afa Refactor tests for querying reported resources 2019-10-19 15:50:48 +03:00
aonomike
08adff74bf Refactor tests for reporting a tag 2019-10-19 15:08:26 +03:00
aonomike
55abe975d9 Refactor tests for reporting a comment 2019-10-19 14:57:10 +03:00
aonomike
58d1ce6515 Refactor tests for reporting a post 2019-10-19 14:27:51 +03:00
aonomike
28f0431ffa Refactor tests for reporting a user 2019-10-19 13:34:54 +03:00
aonomike
bcb880db5e Start refactor of authenticated user path
- Refactor report invlid resource
- Start refactor of valid resource path
2019-10-19 12:51:16 +03:00
aonomike
cf5042d9a4 Refactor report resolver spec
- Set up the apollo server testing
- Refactor unauthenticated path for the mutation
2019-10-19 11:35:36 +03:00
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
2019-10-18 21:58:53 +02:00