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

6525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
c40d6a80a6
Merge pull request #1983 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.5 
build(deps-dev): bump @storybook/addon-actions from 5.2.4 to 5.2.5 in /webapp
 2019-10-24 08:52:00 +02:00
mattwr18
cf5405cf62
Merge pull request #2016 from Human-Connection/1995-shouts-hidden-to-other-users 
Hide shout count on user profile unless my profile
 2019-10-24 08:41:32 +02:00
Alexander Friedland
80736f422b
Merge pull request #2017 from Human-Connection/New_AGB_TermsAndConditions 
new terms and conditions
 2019-10-24 07:44:55 +02:00
dependabot-preview[bot]
7e95d376a3
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) 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/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 21:04:29 +00:00
mattwr18
d5c4eba607
Merge pull request #1989 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.5 
build(deps-dev): bump @storybook/addon-a11y from 5.2.4 to 5.2.5 in /webapp
 2019-10-23 23:01:33 +02:00
dependabot-preview[bot]
ca47471aff
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) 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/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 20:22:47 +00:00
mattwr18
acc7ce9564
Merge pull request #2002 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.0.5 
build(deps-dev): bump @vue/cli-shared-utils from 4.0.4 to 4.0.5 in /webapp
 2019-10-23 22:20:10 +02:00
ogerly
ff8680ff86 new terms and conditions fixed 2019-10-23 18:58:03 +02:00
mattwr18
8f365a60ce Hide shout count on user profile unless my profile 
- we were asked to hide the shouts from other users by Dennis Hack, he
believes people will be more likely to shout a post if it is anonymous.
This only works from our UI to our backend... further steps would need
to be taken to truly make it anonymous. Also, we were asked to implement
it in such a way as to give the user the choice to show their shouts to
others.

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-10-23 14:07:41 +02:00
mattwr18
6142333423
Merge pull request #2015 from Human-Connection/update-to-version-0.1.7 
Update to version 0.1.7
 2019-10-23 13:15:03 +02:00
mattwr18
94f7a9a09e Update to version 0.1.7 2019-10-23 12:23:51 +02:00
mattwr18
20121d268d
Merge pull request #2012 from Human-Connection/2011-fix-bug-load-more-profile-page 
Update fetchMore functionality on profile page
 2019-10-23 11:23:01 +02:00
mattwr18
44e54372c4 Fix block user workflow 
- need to update all the smart queries naming
 2019-10-23 10:51:41 +02:00
mattwr18
fda6f683d4 Update fetchMore functionality on profile page 
- clean up from pinned Posts PR
 2019-10-23 09:41:31 +02:00
mattwr18
015e9b9009
Merge pull request #2001 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.6.0 
build(deps-dev): bump date-fns from 2.5.1 to 2.6.0
 2019-10-23 09:28:38 +02:00
mattwr18
1144baacae
Merge pull request #2000 from Human-Connection/dependabot/npm_and_yarn/backend/faker-9fd8d7d 
build(deps): bump faker from `10bfb9f` to `9fd8d7d` in /backend
 2019-10-23 09:28:03 +02:00
mattwr18
3e47b35fa8
Merge pull request #1986 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.21.2 
build(deps): bump helmet from 3.21.1 to 3.21.2 in /backend
 2019-10-23 09:26:52 +02:00
mattwr18
35307d8ff5
Merge pull request #1985 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.20.0 
build(deps-dev): bump eslint-plugin-jest from 22.19.0 to 22.20.0 in /webapp
 2019-10-23 09:26:32 +02:00
mattwr18
e04757cf8b
Merge pull request #1982 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.7 
build(deps): bump apollo-server-express from 2.9.6 to 2.9.7 in /backend
 2019-10-23 09:26:05 +02:00
dependabot-preview[bot]
a5d993c761
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.0.4 to 4.0.5.
- [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.5/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 04:23:33 +00:00
dependabot-preview[bot]
b855482ee1
build(deps-dev): bump date-fns from 2.5.1 to 2.6.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.1 to 2.6.0.
- [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.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 04:22:33 +00:00
dependabot-preview[bot]
ead6a9e49f
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-23 04:22:11 +00:00
mattwr18
7a41e59554
Merge pull request #1998 from Human-Connection/1997-fix-performance-issue-with-pinned-post 
1997 fix performance issue with pinned post
 2019-10-22 20:28:29 +02:00
roschaefer
6612e4b7ce fix: remove unnecessary pinned orderBy on profile 2019-10-22 20:01:17 +02:00
roschaefer
2a9e182649 fix: performance issue with ordering 
@mattwr18 @aonomike
You must never `ORDER BY` a property with a `@cypher` directive. Reason:
The order by performance will be terribly poor.

See my issue:
https://github.com/neo4j-graphql/neo4j-graphql-js/issues/239
And my PR:
https://github.com/neo4j-graphql/neo4j-graphql-js/pull/247
 2019-10-22 20:00:12 +02:00
mattwr18
f9c36b4e01
Merge pull request #1996 from Human-Connection/update-to-version-0.1.6 
Update to version 0.1.6
 2019-10-22 16:52:27 +02:00
mattwr18
088a822b05 Update to version 0.1.6 2019-10-22 15:06:03 +02:00
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
dependabot-preview[bot]
c997391873
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.19.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.19.0...v22.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 09:19:19 +00:00
dependabot-preview[bot]
d28b3d668d
build(deps): bump apollo-server-express from 2.9.6 to 2.9.7 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.9.6 to 2.9.7.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-express@2.9.6...apollo-server-express@2.9.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 09:19:00 +00:00
dependabot-preview[bot]
158de315c0
build(deps): bump helmet from 3.21.1 to 3.21.2 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.21.1 to 3.21.2.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.21.1...v3.21.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 09:18:51 +00: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