ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-19 03:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,974 Commits 106 Branches 1,553 Tags
Commit Graph

198 Commits

Author SHA1 Message Date
Matt Rider
ea923ae1dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 21:29:10 +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
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00
Matt Rider
29f39c4f45 Update backend tests 
- Every test that created or updated a post needed to be updated to add categoryIds
 2019-08-20 15:54:51 +02:00
roschaefer
58795ad990 Implement error reporting for the backend 2019-08-19 20:14:43 +02:00
Matt Rider
555c5254bc Add tests, validations for too many categories 
- Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-08-19 17:31:55 +02:00
Matt Rider
3b09c31cbb Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-19 16:55:29 +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
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
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
Robert Schäfer
d4c3b7ac10 Merge embed service with backend 2019-07-19 20:32:53 +02:00
Wolfgang Huß
f47724da6a One notifyMentions function for Posts and Comments 2019-07-18 17:33:34 +02:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
Matt Rider
1c53c58f42 Add backend validation tests to expose non-validation 
- remove validation/index.js as it's not being used
- move validations to validationMiddleware.js where it validates
 2019-07-16 14:54:13 -03:00