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

1248 Commits

Author SHA1 Message Date
Robert Schäfer
af5772db49
Merge pull request #1256 from Human-Connection/add-masonry-grid 
Add masonry layout grid
 2019-08-21 00:42:48 +02:00
Robert Schäfer
89b377fee1
Merge pull request #1281 from Human-Connection/272-add_error_reporting 
272 add error reporting
 2019-08-20 19:07:49 +02:00
Alina Beck
626e9e24d4 use rowGap property with gridRowGap as fallback 2019-08-20 15:46:41 +01:00
mattwr18
830552cfc4
Merge pull request #1018 from Human-Connection/1017-send-out-notifications-on-create-omment 
🍰 Send out notifications on CreateComment
 2019-08-20 13:25:34 +02:00
Robert Schäfer
da7ab5a5f8
Merge pull request #1299 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.1.0 
Bump eslint-config-prettier from 6.0.0 to 6.1.0 in /webapp
 2019-08-20 12:07:42 +02:00
Matt Rider
f5ef859cc9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into add-masonry-grid 2019-08-20 08:52:31 +02:00
Matt Rider
dc1e25b090 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-20 08:38:00 +02:00
Matt Rider
a77c9638f6 Refactor Notification.vue 
- Follow @alina-beck's suggestions, use notification over notification: true, use span with font weight and margin-right to remove  
 2019-08-20 08:36:05 +02:00
dependabot-preview[bot]
ee8ea57682
Bump eslint-plugin-standard from 4.0.0 to 4.0.1 in /webapp 
Bumps [eslint-plugin-standard](https://github.com/standard/eslint-plugin-standard) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/standard/eslint-plugin-standard/releases)
- [Commits](https://github.com/standard/eslint-plugin-standard/compare/v4.0.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 04:24:31 +00:00
dependabot-preview[bot]
f29507b6f6
Bump eslint-config-prettier from 6.0.0 to 6.1.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 04:23:28 +00:00
roschaefer
07a90b8865 Simplify webapp sentry configuration 
If commit is set, use it as `release`.
 2019-08-19 21:43:22 +02:00
roschaefer
58795ad990 Implement error reporting for the backend 2019-08-19 20:14:43 +02:00
roschaefer
4d29206982 Configure sentry for nuxtJS 2019-08-19 20:14:43 +02:00
Robert Schäfer
a20ed6abf6
Merge pull request #1287 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.9.0 
Bump jest from 24.8.0 to 24.9.0 in /webapp
 2019-08-19 20:04:14 +02:00
Alina Beck
3703fc787a fix lint errors – thanks github editor 2019-08-19 16:23:38 +01:00
Robert Schäfer
13d9965599
Merge pull request #1294 from Human-Connection/1221-fix-logout-login-bug 
Downgrade @nuxtjs/apollo
 2019-08-19 16:54:51 +02:00
dependabot-preview[bot]
f65c3dea14
Bump jest from 24.8.0 to 24.9.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 14:50:55 +00:00
Robert Schäfer
3b6e211640
Merge pull request #1290 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.5 
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /webapp
 2019-08-19 16:50:20 +02:00
Robert Schäfer
8a147c5153
Merge pull request #1292 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-24.9.0 
Bump babel-jest from 24.8.0 to 24.9.0 in /webapp
 2019-08-19 16:48:32 +02:00
Alina Beck
b74c47a265
Merge branch 'master' into add-masonry-grid 2019-08-19 15:05:54 +01:00
Alina Beck
0bb746804b add masonry grid item tests 2019-08-19 14:06:32 +01:00
Alina Beck
5abf6003cc add tests for masonry grid 2019-08-19 13:15:13 +01:00
Alina Beck
52c3a15be1 use masonry grid on user profile 2019-08-19 12:01:43 +01:00
Matt Rider
053d8bcf7b Fix UserQuery 2019-08-19 11:41:23 +02: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
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
mattwr18
90fa70e83d
Merge pull request #1282 from Human-Connection/count_from_0_to_0_by_default 
Get rid of property warnings
 2019-08-19 10:06:09 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries 
Refactor graphql queries
 2019-08-19 09:58:38 +02:00
Matt Rider
12131f2ee3 Downgrade @nuxtjs/apollo 
- Upgrading breaks our logut/login flow
- see
https://github.com/nuxt-community/apollo-module/releases
https://github.com/nuxt-community/apollo-module/pull/242/files
 2019-08-19 09:03:37 +02:00
dependabot-preview[bot]
63c05d76b5
Bump babel-jest from 24.8.0 to 24.9.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.9.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:36:03 +00:00
dependabot-preview[bot]
a2e1f52294
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.4 to 2.0.0-beta.5.
- [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.0.0-beta.4...v2.0.0-beta.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:34:24 +00: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
Wolfgang Huß
f653bac9e1 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.spec.js
 2019-08-16 18:22:36 +02:00
Wolfgang Huß
0b9a58e317 Wrote and tested the mention of a blocked user on a post of a blocker 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-16 18:14:14 +02:00
roschaefer
aa52587f83 Get rid of property warnings 
If we always choose `0` as the default value for `endVal` in case it is
not given (maybe apollo assigns null when the request is in flight) then
just make `0` the default.
 2019-08-16 17:08:00 +02:00
Wolfgang Huß
efb5c75c24 Refactor after Roberts suggestions, number I 
Start writing tests
 2019-08-16 16:56:14 +02:00
mattwr18
90e5579cab
Merge pull request #1278 from Human-Connection/fix_hashtag_db_import 
Fix hashtag db import
 2019-08-16 14:37:09 +02:00
Matt Rider
fdc0d808f6 Fix search query 2019-08-16 14:18:18 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor 
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
 2019-08-16 13:28:55 +02:00
Matt Rider
d511d6aa78 Refactor graphql queries 
- Remove duplicate queries
- Use smart query in pages/post/_id/_slug/index.vue to avoid multiple db requests for a post and its comments.
We cannot update the apollo cache with asyncData and smart queries have a prefetch policy set to true by default, which
means that they will resolve in a similar timeframe. https://stackoverflow.com/questions/55885337/in-nuxt-should-i-use-asyncdata-or-default-apollo-queries
https://vue-apollo.netlify.com/api/smart-query.html#options
https://vue-apollo.netlify.com/guide/ssr.html#vue-cli-plugin
 2019-08-16 11:25:53 +02:00
roschaefer
51b734275a The name of the hashtag is now it's ID 
`name` was just a redundant attribute
 2019-08-16 01:49:29 +02:00
roschaefer
3d4724e314 Fix Cannot read property countUser of null 
This commit message is a great example of why you should explain
**the reason** of your commit.

When I came across this bug I had a quick look into the code where it
came from. I could see that the bug only happened after a timer and
apparently reverting the biggest part of d84892930295dcfd3f6687fc33c7234446127099
would fix the bug. However I have no idea what the following commit
message means:

```
commit d84892930295dcfd3f6687fc33c7234446127099
Author: Grzegorz Leoniec <greg@app-interactive.de>
Date:   Wed Mar 6 18:45:57 2019 +0100

    Improved countTo component
```

I just don't know why the code is there - like what is it's purpose
@appinteractive? I can only guess: I believe that it's supposed to
update the counters in-place (without starting from 0 everytime).
Because apollo was set to poll the data every second.

Taking that into account I would rather remove this polling feature
completely and have less code and less complexity. Admins can still
refresh the page.
 2019-08-16 00:28:13 +02:00
Alina Beck
b05599de83 fix item height calculation 2019-08-15 21:44:22 +01:00
Robert Schäfer
1c1d74e30d
Merge pull request #1274 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.19 
Bump @human-connection/styleguide from 0.5.18 to 0.5.19 in /webapp
 2019-08-15 22:36:19 +02: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
Robert Schäfer
9ccfa2f0da
Merge pull request #1176 from Human-Connection/845-load-more 
845 load more
 2019-08-15 22:03:32 +02:00
dependabot-preview[bot]
22f79d6e0b
Bump @human-connection/styleguide from 0.5.18 to 0.5.19 in /webapp 
Bumps @human-connection/styleguide from 0.5.18 to 0.5.19.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 20:00:09 +00:00