IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-03-27 20:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,950 Commits 6 Branches 90 Tags
Commit Graph

16950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
244a23a3dd
Merge pull request #1257 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.0 
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend
 2019-08-14 23:52:51 +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
Wolfgang Huß
e8c1a5fe8d Write backend tests 2019-08-14 18:05:13 +02:00
Wolfgang Huß
43c2764fcf Fix mentions and hashtags in editor 2019-08-14 18:05:03 +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
Alina Beck
df7b736f5d add validator function for grid gap 2019-08-14 15:29:48 +01:00
Alina Beck
3f4a8a543e pass numbers as numbers 2019-08-14 15:22:08 +01: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
Alina Beck
3fa3d6f5c4 use design tokens for grid gap 2019-08-14 12:28:17 +01:00