Wolfgang Huß
3e91a66673
Correct wrong merge of master
2019-08-22 08:32:19 +02:00
Wolfgang Huß
3d2df56141
Backend tests
2019-08-21 14:27:32 +02:00
Wolfgang Huß
d98ebdd713
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post
2019-08-21 08:37:43 +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
Wolfgang Huß
83a538d345
Write backend tests
...
Rename files.
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-08-19 22:13:42 +02:00
roschaefer
58795ad990
Implement error reporting for the backend
2019-08-19 20:14:43 +02:00
Wolfgang Huß
aae5fd396e
Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post
...
# Conflicts:
# backend/src/middleware/handleNotifications/handleNotifications.js
# backend/src/middleware/handleNotifications/handleNotifications.spec.js
# webapp/components/notifications/Notification/Notification.vue
# webapp/components/notifications/NotificationMenu/NotificationMenu.vue
2019-08-19 16:58:18 +02:00
Wolfgang Huß
68c25b8d54
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post
...
# Conflicts:
# backend/src/middleware/handleNotifications/handleNotifications.spec.js
2019-08-19 08:42:00 +02:00
Wolfgang Huß
a972215579
Lint fix
2019-08-16 18:29:26 +02: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ß
1ff7750918
Remove comment
2019-08-16 18:15:40 +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
Wolfgang Huß
efb5c75c24
Refactor after Roberts suggestions, number I
...
Start writing tests
2019-08-16 16:56:14 +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
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
Wolfgang Huß
af70d4f717
Get Notification for author for Commenting their Posts
2019-08-15 16:59:42 +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
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
Wolfgang Huß
67f25104f4
Fixing lint
2019-08-14 13:22:01 +02:00
Wolfgang Huß
825a5f235a
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment
2019-08-14 13:10:19 +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
5103bdbc2a
Fix tests
2019-08-13 11:50:33 +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
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
Matt Rider
21aa729edb
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment
2019-08-08 09:10:18 +02:00
Matt Rider
39a94a8aac
Refactor
...
- follow PR review by @roschaefer
2019-08-07 14:55:32 +02:00
Matt Rider
53af29b5a2
Refactor backend tests
...
- to use neode and apollo-server-testing
2019-08-06 18:26:39 +02:00
Matt Rider
1593eab9cf
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts
2019-08-06 08:07:39 +02:00
Wolfgang Huß
22b9bf77fa
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment
...
# Conflicts:
# backend/src/schema/resolvers/notifications.spec.js
2019-08-05 10:15:20 +02:00
Matt Rider
d1d82a0051
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts
2019-08-02 16:55:54 +02:00
Robert Schäfer
f1b28c83a0
Meld commits from master
2019-08-02 14:26:06 +02:00
Robert Schäfer
e1bb6ed74e
Fix lint
2019-08-02 01:45:36 +02:00
Matt Rider
fb9a632d55
Query a currentUsers emotions for a post, translations
2019-08-01 15:11:41 +02:00
Robert Schäfer
b6a59460bd
Merge remote-tracking branch 'origin/master' into storybook
2019-08-01 12:22:09 +02:00
Robert Schäfer
c9e6d182ec
Followed @mattwr18's suggestions here:
...
https://github.com/Human-Connection/Human-Connection/pull/952#pullrequestreview-269406016
2019-08-01 12:20:33 +02:00
Matt Rider
08899a4af9
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts
2019-08-01 09:22:57 +02:00
Robert Schäfer
72edf78889
Meld a chaotic commit history into one commit
...
Some important commit messages:
```
Fix youtu.be not being embedded
And also try to maintain the old behaviour matching
`provider.provider_url`.
```
```
Remove confusing code comments and obsolete code
I discovered that the behaviour of no duplicate notifications being send
out is caused by the frontend: When the editor reads html from the
backend, it will parse hashtags and mentions as ordinary links, not as
their respective nodes during editing. Also, we don't have to worry
about duplicate ids being found: The cypher statement will implicitly
suppress duplicate notification nodes for the same user.
So let's remove the code to avoid confusing the next developer.
```
```
Test editor.getHTML()
I do this because I'm not able to test the content of `this.editor` from
a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
and use it as a computed property `renderedContent` to populate a `<div
v-html="renderedContent" />` this will not work for the embeds. So, my
current best bet is to test the editor object isolated from a real
component. ;(
```
```
Add core-js as explicit dependency
Because of build errors on Travis.
See: https://stackoverflow.com/a/55313456
Remove as soon as this issue is resolved:
https://github.com/storybookjs/storybook/issues/7591
```
```
Refactor: Keep Runtime-only builds
See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
2019-08-01 00:28:22 +02:00
Robert Schäfer
448706ab18
Merge remote-tracking branch 'origin/master' into refactor-social-media-backend
2019-07-31 17:36:02 +02:00
Matt Rider
5423412958
Set up UI
2019-07-31 14:58:05 +02:00
Matt Rider
0a98113c2d
Add backend tests for RemovePostEmotions
2019-07-30 13:28:30 +02:00
Alina Beck
4f068116b9
add social media permissions in middleware
2019-07-29 17:16:40 +02:00
Alina Beck
0439b4407b
remove social media validations from middleware
2019-07-29 17:16:05 +02:00
Matt Rider
3e43539e23
Set up some backend tests for emotions
2019-07-29 17:08:07 +02:00
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media
...
🍰 Refine social media
2019-07-29 16:08:08 +02:00
Matt Rider
322ec597a3
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts
2019-07-29 12:40:01 +02:00
Robert Schäfer
c5789cbf90
Fix get-video-id expects a string bug
2019-07-22 00:20:43 +02:00
Robert Schäfer
657a5ac1f5
Fix resolve function returns undefind
...
I'm also trying to make sense of the attribute `sources` - probably it's
indicating where the data is coming from.
2019-07-21 23:31:44 +02:00
