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

4841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
048c4a2502
Merge pull request #1224 from Human-Connection/A-1208-Registration-without-user-condition-confirmation 
🍰 Registration confirmation of terms of use added II
 2019-08-14 18:09:07 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00
roschaefer
58a7e1ce2d Simplifycomponent, improve texts 
@ogerly there is a difference between read and confirm: You can read but
don't have to confirm the terms and conditions. Therefore it's quite
important that the user also confirms the terms and conditions.
 2019-08-14 16:38:35 +02:00
mattwr18
ab6cd501fe
Merge pull request #1209 from Human-Connection/1054-blocked-users 
🍰 1054 blocked users
 2019-08-14 16:36:41 +02:00
Matt Rider
a21cf5aef6 Fix cypress test 2019-08-14 15:19:27 +02:00
Matt Rider
f2dcd99ac5 Fix lint, remove console.log 2019-08-14 14:33:55 +02:00
ogerly
397b41377a delete console.log 2019-08-14 14:31:47 +02:00
Matt Rider
6099a986c9 Improve English, update case for English translations 2019-08-14 14:29:35 +02:00
ogerly
8307c4f48f Merge branch 'A-1208-Registration-without-user-condition-confirmation' of https://github.com/Human-Connection/Human-Connection into A-1208-Registration-without-user-condition-confirmation 2019-08-14 14:29:12 +02:00
ogerly
a5f448036c Suggestions implemented II 2019-08-14 14:27:44 +02:00
Robert Schäfer
34e3f7efd7
Delete package-lock.json 
This file is generated by `npm` but we use `yarn`. It is not recommended to use multiple package managers.
 2019-08-14 14:24:43 +02:00
ogerly
b3ab6e1b43 Suggestions implemented II 2019-08-14 14:12:55 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
mattwr18
0213eec4e2
Merge pull request #1244 from Human-Connection/451-lokalise-unlocalised-texts-20190812 
🍰 454 Lokalise / translate all unlocalised Texts / Translations / Languages
 2019-08-14 12:01:56 +02:00
Wolfgang Huß
25981e0f35 Corrected Cypress test 2019-08-14 08:55:44 +02:00
Wolfgang Huß
ab7d158b26 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190812 2019-08-14 08:24:29 +02:00
Wolfgang Huß
bcb66b0cb3 Corrected English translations to @mattwr18 suggestions 2019-08-14 08:23:54 +02:00
roschaefer
31299235a3 Better caching policy on the blocked users page 
Read: https://medium.com/@galen.corey/understanding-apollo-fetch-policies-705b5ad71980
for the difference. I think it's exactly what we need to update the
blocked users as soon as we switch to the page.
 2019-08-14 00:11:45 +02:00
roschaefer
6b884d84c1 Add translations 2019-08-13 19:56:01 +02:00
roschaefer
073185d424 All cucumbers implemented 2019-08-13 19:46:01 +02:00
roschaefer
b017203c64 Implement next cucumber scenario 2019-08-13 19:09:56 +02:00
roschaefer
fffd29e867 Sketch cucumber scenarios for blocked user feature 
.. first scenario already passing
 2019-08-13 18:20:32 +02:00
roschaefer
d2a6d8c047 Avoid notifications if user was blocked 
Otherwise you would follow a link and get a 404
 2019-08-13 17:16:24 +02:00
roschaefer
6fb926e735 Fix Search.feature in a hacky way 
Ok, we have no control what parameters are passed to the cypher query
generated by `neo4j-graphql-js`. So I'm re-using the `filter` param.
If the `$filter` param is `{}` then we can use COALESCE to turn that
into empty array. Ugh.
 2019-08-13 16:46:52 +02:00
roschaefer
717147bd0c Refetch posts list if you block a user 
Because you won't see any posts of a blocked user
 2019-08-13 16:06:10 +02:00
Robert Schäfer
f711a9c288
Merge pull request #1251 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.1.11 
Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 12:16:55 +02:00
Robert Schäfer
658c5aff52
Merge pull request #1250 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.1.11 
Bump @storybook/addon-a11y from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 12:16:19 +02:00
Robert Schäfer
1a09354bc5
Merge pull request #1255 from Human-Connection/consistent-naming-conventions 
Maintain consistent naming/punctuation conventions
 2019-08-13 12:16:00 +02:00
roschaefer
5103bdbc2a Fix tests 2019-08-13 11:50:33 +02:00
Matt Rider
3eee50d952 Maintain consistent naming/punctuation conventions 2019-08-13 11:24:55 +02:00
Robert Schäfer
bedbb21def Refactor notification spec 
Wow this took me the entire day: If you run `createServer` multiple
times, more and more middlewares get added to the schema. That's why
the test would create 2^n notifications for n times you called
`createServer`. This is related to the following bug:

https://github.com/prisma/graphql-middleware/issues/63
 2019-08-13 11:05:29 +02:00
Robert Schäfer
8de0195cf8 Keep existing filter params + same for text search 2019-08-13 11:05:29 +02:00
Robert Schäfer
5fb60d1132 Implement+test blocking a user on backend 2019-08-13 11:05:29 +02:00
Robert Schäfer
cc1f932803 Refactor tests with Post model 2019-08-13 11:05:29 +02:00
Robert Schäfer
bc4bffdc52 Add How-To for blocking a user 2019-08-13 11:05:29 +02:00
Robert Schäfer
3c610caca4 Fix styling and avatar url of blocked users 2019-08-13 11:05:29 +02:00
Robert Schäfer
7f509b3201 Implement block/unbock UI 2019-08-13 11:05:29 +02:00
Robert Schäfer
824b2a5561 Implement page for blocked users 2019-08-13 11:05:29 +02:00
Robert Schäfer
293054a05b Implement block+unblock basic features 2019-08-13 11:05:29 +02:00
Robert Schäfer
700bdcb8f1 Implement+test unblock mutation 2019-08-13 11:05:29 +02:00
Robert Schäfer
f5a59568ab Implement block except for the unfollow feature 2019-08-13 11:05:29 +02:00
Robert Schäfer
05aee24efd Implement+test User.blockedUsers resolver 2019-08-13 11:05:29 +02:00
Robert Schäfer
b63f6b0ba1 Setup blocked relationships in seeds 2019-08-13 11:05:29 +02:00
Robert Schäfer
f8b37b5c1e Remove obsolete relationship 'BLACKLISTED' 2019-08-13 11:05:29 +02:00
Robert Schäfer
6950068a12 Sketch test for #1054 2019-08-13 11:05:29 +02:00
Robert Schäfer
5c0432d855
Merge pull request #1253 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.15.1 
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /webapp
 2019-08-13 11:03:31 +02:00
mattwr18
c6deb051c5
Merge pull request #1232 from Human-Connection/get_rid_of_annoying_engines_constraint 
I had enough of `--ignore-engines`
 2019-08-13 10:46:25 +02:00
dependabot-preview[bot]
bae2c63c78
Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.1.10 to 5.1.11.
- [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.1.11/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:11:45 +00:00
dependabot-preview[bot]
1fa1e278f2
Bump @storybook/addon-a11y from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.1.10 to 5.1.11.
- [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.1.11/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:11:45 +00:00
dependabot-preview[bot]
5c6fe99ffa
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1.
- [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.15.0...v22.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:10:53 +00:00