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

1997 Commits

Author SHA1 Message Date
mattwr18
6dfe0ce7af
Merge pull request #2025 from Human-Connection/fix_maintenance_dockerfile 
fix: Don't attempt to save locale if not authenticated
 2019-10-24 14:22:08 +02:00
Robert Schäfer
d3b3d9231e
Merge pull request #2027 from Human-Connection/new-terms-conditions-version-0.0.3 
🍰 New terms and conditions version 0.0.3
 2019-10-24 13:52:29 +02:00
mattwr18
5c12914e02 Add test cases for LocaleSwitch 
- if there is a currentUser then update their locale in the database,
otherwise, do not.
 2019-10-24 13:52:21 +02:00
Wolfgang Huß
d2fd33b102 Fix tests 2019-10-24 12:54:51 +02:00
mattwr18
821ea6d671 Update LocaleSwitch with guard clause 
- return if there is no currentUser
- do not copy graphql directory as there is no need to send messages to
backend
 2019-10-24 12:45:55 +02:00
Wolfgang Huß
114c7531bb Change terms and condition version to 0.0.3 2019-10-24 11:32:45 +02:00
mattwr18
945033a687
Merge pull request #2023 from Human-Connection/2022-fix-pinned-post-appearing-twice-bug 
Remove duplicate pinned post record
 2019-10-24 11:24:15 +02:00
roschaefer
9d522353cc fix: import missing files in maintenance image 
@ogerly the maintenance page needs just two components of the webapp
folder. For that reason we import only these. If you add imports to
`LocaleSwitch` component, you need to copy those files in the
Dockerfile.
 2019-10-24 11:14:22 +02:00
mattwr18
69c0247ae5
Merge pull request #2021 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.8.0 
build(deps): bump @nuxtjs/axios from 5.6.0 to 5.8.0 in /webapp
 2019-10-24 10:48:56 +02:00
mattwr18
a38731fcae
Merge pull request #1991 from Human-Connection/Locale_save_by_change_LocalSwitch 
Locale save by change local switch
 2019-10-24 10:02:46 +02:00
mattwr18
a923cb2e62 Remove duplicate pinned post record 
- Maintain consistent orderBy for fetchMore
 2019-10-24 09:58:22 +02:00
Alexander Friedland
b584f12bb1
change 
change()  change to updateUserLocale()
 2019-10-24 08:52:24 +02:00
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]
62d1b1b13f
build(deps): bump @nuxtjs/axios from 5.6.0 to 5.8.0 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.6.0 to 5.8.0.
- [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.6.0...v5.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 04:20:15 +00: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
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
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
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
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
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
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
ogerly
9dccb5fc0a Save language for the user permanently when changing the language 2019-10-22 11:34:04 +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
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
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
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
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
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]
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
Mogge
8728feaa37
fix: Only one ellipse is displayed 2019-10-21 11:33:26 +02: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
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
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
mattwr18
e37736500a Move comment to above relevant code 2019-10-18 19:05:00 +02:00
mattwr18
7e40295129 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 19:03:45 +02:00