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

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
7c7ddfb4d8
Merge pull request #1249 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.1.11 
Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 10:08:55 +02:00
mattwr18
b1ef575329
Merge pull request #1248 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.15.1 
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend
 2019-08-13 10:08:09 +02:00
ogerly
bd27876d9c check test 2 2019-08-13 08:36:09 +02:00
dependabot-preview[bot]
459099f1e1
Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) 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/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:57 +00:00
dependabot-preview[bot]
b56cabb8a4
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend 
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 04:22:43 +00:00
Wolfgang Huß
6d93391f87
Update webapp/locales/en.json 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-08-12 20:03:51 +02:00
Wolfgang Huß
33007c6bbe
Update webapp/locales/de.json 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-08-12 20:00:54 +02:00
Robert Schäfer
e46d8559ee
Merge pull request #1234 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.3 
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend
 2019-08-12 18:23:57 +02:00
Robert Schäfer
d5c7f78615
Merge pull request #1237 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-cache-inmemory-1.6.3 
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp
 2019-08-12 18:23:14 +02:00
dependabot-preview[bot]
e34c7f196f
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:58:45 +00:00
Robert Schäfer
02dc30ea43
Merge pull request #1235 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.13.1 
Bump cypress-cucumber-preprocessor from 1.13.0 to 1.13.1
 2019-08-12 16:57:33 +02:00
dependabot-preview[bot]
db0cd54dbc
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:56:59 +00:00
Robert Schäfer
79f7e421ad
Merge pull request #1238 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-7.2.0 
Bump sass-loader from 7.1.0 to 7.2.0 in /webapp
 2019-08-12 16:56:52 +02:00
Robert Schäfer
98a6c333e9
Merge pull request #1236 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.4 
Bump apollo-client from 2.6.3 to 2.6.4 in /backend
 2019-08-12 16:55:13 +02:00
Robert Schäfer
b79951adb0
Merge pull request #1239 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.4 
Bump apollo-client from 2.6.3 to 2.6.4 in /webapp
 2019-08-12 16:54:38 +02:00
Wolfgang Huß
1d180480c4 Translated several texts and corrected and added some functionalities 2019-08-12 15:35:09 +02:00
Wolfgang Huß
5932d184d7 Corrected namings and countings 2019-08-12 13:27:14 +02:00
Wolfgang Huß
2d67ffd3fe
Merge pull request #1233 from Human-Connection/1231-fix_filters 
🍰 [Bugfix] Fix filter menu and refactor default layout
 2019-08-12 12:24:45 +02:00
Robert Schäfer
9026157018 Better hasMore: Don't wait until length == 0 
follow @Tirokk
 2019-08-12 11:50:23 +02:00
dependabot-preview[bot]
b02321b80d
Bump apollo-client from 2.6.3 to 2.6.4 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

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