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

1179 Commits

Author SHA1 Message Date
Alina Beck
52c3a15be1 use masonry grid on user profile 2019-08-19 12:01:43 +01:00
Alina Beck
bec5ed9695 remove computed props from grid 2019-08-19 10:37:20 +01:00
Alina Beck
b0de4ec2b5 move calculation from grid to grid item 2019-08-19 10:16:44 +01:00
Alina Beck
0aa1b8046b remove grid logic from post component 2019-08-18 18:28:48 +01:00
Alina Beck
76be960c03 move grid calculations to masonry grid components 2019-08-18 18:25:14 +01:00
Alina Beck
b05599de83 fix item height calculation 2019-08-15 21:44:22 +01:00
Alina Beck
da8491a559 style filter menu grid item 2019-08-15 21:29:37 +01:00
Alina Beck
8ad1ad3769 look at this new and shiny grid component 2019-08-15 21:06:26 +01:00
Alina Beck
93142cc76b upgrade styleguide to 0.5.19 2019-08-15 17:41:13 +01:00
Alina Beck
38100b2df7 add masonry grid 2019-08-15 11:04:30 +02:00
Robert Schäfer
dac417f0a5
Merge pull request #1258 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.26.2 
Bump tiptap-extensions from 1.26.1 to 1.26.2 in /webapp
 2019-08-15 00:33:37 +02:00
Robert Schäfer
4249ba7334
Merge pull request #1260 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-izitoast-ba6b03e 
Bump vue-izitoast from `c246fd7` to `ba6b03e` in /webapp
 2019-08-14 23:53:42 +02:00
dependabot-preview[bot]
a163fe17e9
Bump tiptap-extensions from 1.26.1 to 1.26.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.1 to 1.26.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.1...tiptap-extensions@1.26.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 21:43:20 +00:00
Robert Schäfer
09e89b19e9
Merge pull request #1259 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.24.2 
Bump tiptap from 1.24.1 to 1.24.2 in /webapp
 2019-08-14 23:40:59 +02:00
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
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
a5f448036c Suggestions implemented II 2019-08-14 14:27:44 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +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
dependabot-preview[bot]
801ef5316a
Bump vue-izitoast from c246fd7 to ba6b03e in /webapp 
Bumps [vue-izitoast](https://github.com/roschaefer/vue-izitoast) from `c246fd7` to `ba6b03e`.
- [Release notes](https://github.com/roschaefer/vue-izitoast/releases)
- [Commits](c246fd78b1...ba6b03eb24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 04:28:55 +00:00
dependabot-preview[bot]
831c9b7c5f
Bump tiptap from 1.24.1 to 1.24.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.24.1 to 1.24.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.24.1...tiptap@1.24.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 04:27:34 +00: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
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
Matt Rider
3eee50d952 Maintain consistent naming/punctuation conventions 2019-08-13 11:24:55 +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
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
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
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
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]
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