IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-03 08:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,971 Commits 6 Branches 100 Tags
Commit Graph

16971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
50fc7b8580
Merge pull request #1271 from Human-Connection/fix_missing_slug 
Fix user mention menu on production data
 2019-08-16 09:22:46 +02:00
dependabot-preview[bot]
ba1052d337
Bump @hapi/joi from 15.1.0 to 15.1.1 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 15.1.0 to 15.1.1.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v15.1.0...v15.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-16 04:19:32 +00: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
bb4b3196a7 Fix various issues in legacy db import 
Most important: Remove `#` symbol from Tags and snakeCase them.
 2019-08-16 00:29:42 +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
roschaefer
d3b256e99e Fix user mention menu on production data 
Apparently some of our users in production have no slug, this will
assign an (hopefully unique) random slug to them.
 2019-08-15 21:07:23 +02:00
Robert Schäfer
2cb8719d5f
Merge pull request #1269 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.18 
Bump @human-connection/styleguide from 0.5.17 to 0.5.18 in /webapp
 2019-08-15 20:35:20 +02:00
Wolfgang Huß
8acccc99d0 Implemented a reason in the Notification 
Used this for displaying in the mentions menu in frontend.
Rewrite backend test.
 2019-08-15 19:29:06 +02:00
Alina Beck
93142cc76b upgrade styleguide to 0.5.19 2019-08-15 17:41:13 +01:00
Alina Beck
be4d526505 bump version to 0.5.19 2019-08-15 17:12:48 +01:00
Alina Beck
9e49afaac3
Merge pull request #131 from Human-Connection/add-grid-layout 
Add grid component
 2019-08-15 17:08:24 +01:00
dependabot-preview[bot]
8305c69def
Bump @human-connection/styleguide from 0.5.17 to 0.5.18 in /webapp 
Bumps @human-connection/styleguide from 0.5.17 to 0.5.18.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 15:43:57 +00:00
roschaefer
79cbcf2901 Update to 0.5.18 
dependency updates
 2019-08-15 17:29:48 +02:00
roschaefer
f83a13c7f2 Update transitive dependencies 
Should fix our security vulnerabilities
 2019-08-15 17:29:04 +02:00
Robert Schäfer
f87d8dacfd
Merge pull request #122 from Human-Connection/dependabot/npm_and_yarn/remarkable-1.7.4 
[Security] Bump remarkable from 1.7.1 to 1.7.4
 2019-08-15 17:18:59 +02:00
dependabot-preview[bot]
461a762205
[Security] Bump remarkable from 1.7.1 to 1.7.4 
Bumps [remarkable](https://github.com/jonschlinkert/remarkable) from 1.7.1 to 1.7.4. **This update includes security fixes.**
- [Release notes](https://github.com/jonschlinkert/remarkable/releases)
- [Changelog](https://github.com/jonschlinkert/remarkable/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jonschlinkert/remarkable/compare/1.7.1...v1.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 15:11:41 +00:00
Robert Schäfer
9d5cb51ed5
Merge pull request #134 from Human-Connection/massive_update 
Update all packages with `ncu -u`
 2019-08-15 17:10:10 +02:00
roschaefer
67bd1184aa Fine tune throttle delay 2019-08-15 17:09:08 +02:00
Wolfgang Huß
af70d4f717 Get Notification for author for Commenting their Posts 2019-08-15 16:59:42 +02:00
kachulio1
314dfcf413 Throw error if no categories on post creation 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-08-15 17:55:02 +03:00
roschaefer
e6352cc6fb Update all packages with ncu -u 
And fix another bug: require(...).default returns the string content
of the file.
 2019-08-15 16:07:16 +02:00
Robert Schäfer
57fe905a96
Merge pull request #133 from Human-Connection/fix_build_errors 
Fix build errors
 2019-08-15 15:51:39 +02:00
Wolfgang Huß
5b5489232f Rename files 2019-08-15 15:47:53 +02:00
Wolfgang Huß
a6eaea70dc Add UpdateComment support for Mentions in Comment 2019-08-15 15:47:13 +02:00
roschaefer
79a8fc5f5f Fix javascript runtime errors 
I could see a warning about duplicate keys on the `Chip` page, also
there seems to be a missing check if a param is null (I used a default).
 2019-08-15 15:46:29 +02:00
roschaefer
3d41d811d2 Update the minimum of package to get a build 
I was not able to build the styleguide on my machine. This commit allows
me to get at least to http://127.0.0.1:8080/ to see some components.

Here are my specs:
```sh
robert@e480 ~> node --version
v12.7.0
robert@e480 ~> yarn --version
1.17.3
robert@e480 ~> cat /proc/version
Linux version 5.2.6-arch1-1-ARCH (builduser@heftig-3961) (gcc version 9.1.0 (GCC)) #1 SMP PREEMPT Sun Aug 4 14:58:49 UTC 2019
```
 2019-08-15 15:43:46 +02:00
Wolfgang Huß
be98f56651 Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-15 12:30:18 +02:00
Matt Rider
f0af231975 Merge branch '1017-send-out-notifications-on-create-omment' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 12:14:22 +02:00
Matt Rider
f12e2a6e16 Add force true to click on Report User 2019-08-15 12:12:00 +02:00
roschaefer
a052743e8b Bind infinite-scroll-* correctly 2019-08-15 11:39:09 +02:00
Wolfgang Huß
b53d17fa6c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-Notification-about-comment-on-post 2019-08-15 11:33:22 +02:00
Robert Schäfer
f5c939472b Fix console.errors in frontend tests 
@MoldaB here's how you can register plugins in a frontend test. Pro tip:
You can run `yarn run test --run-in-band` to find out where the
console.errors come from. Jest, by default, runs in parallel which makes
it a little difficult to debug errors that don't fail the test.
 2019-08-15 11:08:42 +02:00
molda
7cd3b0d524 implemented infinite-scroll in profile page 2019-08-15 11:08:42 +02:00
molda
2edf26ac0a implemented infinite-scroll to index page 2019-08-15 11:08:42 +02:00
molda
8f7ec2efe6 added vue-infinite-scroll plugin 2019-08-15 11:08:42 +02:00
Wolfgang Huß
6ab9a3204b Fix the backend test 2019-08-15 11:07:57 +02:00
Alina Beck
38100b2df7 add masonry grid 2019-08-15 11:04:30 +02:00
Robert Schäfer
544fd0d84c
Merge pull request #1265 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-middleware-3.0.5 
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend
 2019-08-15 11:02:07 +02:00
Wolfgang Huß
0d66cc4dcf 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.js
#	backend/src/schema/types/schema.gql
 2019-08-15 10:16:33 +02:00
Matt Rider
569ace137b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 10:14:47 +02:00
Wolfgang Huß
c2357d32b3 Fixed broken Editor tests without breaking the Mentions and the Hashtags in the Editor 2019-08-15 07:52:49 +02:00
dependabot-preview[bot]
31fa930ee2
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.3 to 3.0.5.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.3...v3.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 04:21:52 +00: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