ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,939 Commits 117 Branches 1,511 Tags
Commit Graph

226 Commits

Author SHA1 Message Date
Robert Schäfer
b58ffc058f
Merge pull request #532 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.0 
Bump nodemon from 1.18.11 to 1.19.0 in /backend
 2019-05-06 23:06:23 +02:00
Robert Schäfer
7efa95b502
Merge pull request #539 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.5 
Bump graphql-shield from 5.3.4 to 5.3.5 in /backend
 2019-05-06 23:05:55 +02:00
dependabot[bot]
0beb2d1763
Bump neo4j-driver from 1.7.3 to 1.7.4 in /backend 
Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 1.7.3 to 1.7.4.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/1.7.3...1.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 04:46:30 +00:00
dependabot[bot]
54fe0a58e2
Bump graphql-shield from 5.3.4 to 5.3.5 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.4 to 5.3.5.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.4...v5.3.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 04:51:08 +00:00
dependabot[bot]
57dfd6fb66
Bump nodemon from 1.18.11 to 1.19.0 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.11 to 1.19.0.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.11...v1.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-02 04:50:59 +00:00
dependabot[bot]
e70bdc4754
Bump sanitize-html from 1.20.0 to 1.20.1 in /backend 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 21:03:09 +00:00
Robert Schäfer
773396622d
Merge pull request #521 from Human-Connection/dependabot/npm_and_yarn/backend/node-fetch-2.4.1 
Bump node-fetch from 2.3.0 to 2.4.1 in /backend
 2019-04-30 22:59:33 +02:00
dependabot[bot]
9138f0032e
Bump @babel/cli from 7.4.3 to 7.4.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 12:31:10 +00:00
Robert Schäfer
2052e69c60
Merge pull request #516 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.4 
Bump @babel/core from 7.4.3 to 7.4.4 in /backend
 2019-04-30 14:27:26 +02:00
Robert Schäfer
006554fdda
Merge pull request #522 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/register-7.4.4 
Bump @babel/register from 7.4.0 to 7.4.4 in /backend
 2019-04-30 14:26:46 +02:00
dependabot[bot]
cb42cc0187
Bump node-fetch from 2.3.0 to 2.4.1 in /backend 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/bitinn/node-fetch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.3.0...v2.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:26:36 +00:00
dependabot[bot]
1294f99366
Bump @babel/core from 7.4.3 to 7.4.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:23:04 +00:00
dependabot[bot]
fefe4a9ef2
Bump @babel/register from 7.4.0 to 7.4.4 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.4.0 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.0...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:22:58 +00:00
Robert Schäfer
f3d49cd057
Merge pull request #508 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.5.1 
Bump eslint-plugin-jest from 22.5.0 to 22.5.1 in /backend
 2019-04-30 13:22:16 +02:00
Matt Rider
94384a7608 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-29 14:57:46 -03:00
Matt Rider
1b84ccbdfa Update to allow single character comments or greater 2019-04-29 12:19:27 -03:00
dependabot[bot]
303e66b383
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-29 04:54:51 +00:00
Matt Rider
5891129662 Ordered comments like alpha, move HcCommentForm, mobile responsive 
- in the first instance, we will be importing posts/comments from the alpha, so to maintain consistency, we've ordered them alike. In the future, we could support user choice of order.
- Gives more space for HcCommentForm, user can see comments added to list, helps with mobile responsiveness

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-26 08:57:29 -03:00
dependabot[bot]
d7102d48a1
Bump eslint-plugin-jest from 22.5.0 to 22.5.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.5.0 to 22.5.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.5.0...v22.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-26 04:49:58 +00:00
Robert Schäfer
629df47104 Merge remote-tracking branch 'origin/master' into 260-add-comment-form 2019-04-25 14:24:57 +02:00
Robert Schäfer
3cfa5b0cd4
Merge pull request #485 from Human-Connection/353-restore_neo4j_backup 
Refactor maintenance-worker docker image
 2019-04-25 12:48:57 +02:00
dependabot[bot]
473bf63946
Bump eslint-plugin-jest from 22.4.1 to 22.5.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.4.1 to 22.5.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.4.1...v22.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-25 04:46:46 +00:00
Matt Rider
0078b743fe Validate comments length, presence/test 
- Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-24 09:11:33 -03:00
Matt Rider
23b0bbfbbe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 07:41:25 -03:00
Robert Schäfer
c7a08b792e Move maintenance & neo4j in dedicated folders 2019-04-23 23:12:16 +02:00
Robert Schäfer
0352154742 Removing unused docker-compose.yml in backend/ 2019-04-23 23:12:00 +02:00
Robert Schäfer
77ac0ce7a6 Rename db-migration-worker to maintenance-worker 2019-04-23 23:12:00 +02:00
dependabot[bot]
84f672ed2d
[Security] Bump jquery from 3.3.1 to 3.4.0 in /backend 
Bumps [jquery](https://github.com/jquery/jquery) from 3.3.1 to 3.4.0. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.3.1...3.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 16:06:44 +00:00
Matt Rider
43d6254f3e Add custom CommentByPost query 2019-04-23 12:23:21 -03:00
Matt Rider
a9f720753a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-22 08:10:06 -03:00
dependabot[bot]
d1bc3847af
Bump graphql-shield from 5.3.3 to 5.3.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.3...v5.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-19 04:47:45 +00:00
Matt Rider
3d2a982d3f Attempt to updated comments 
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
 2019-04-18 22:14:23 -03:00
Matt Rider
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00
Robert Schäfer
57a53a44b2 Fix seeded notifications 2019-04-18 16:43:06 +02:00
Robert Schäfer
0811ca8248 Massive refactoring of factories 
cc @mattwr18 @tirokk @ulfgebhardt @appinteractive

The factories don't use string interpolation now but they use variables.
This resolves some errors of escaping strings when you send html along
with `post.content`. It is much cleaner, too.
 2019-04-18 16:41:34 +02:00
Matt Rider
0149f30f5f Fix failing tests, refactor 
- due to changes made to comments factories, which caused failures
- to use new custom CreateComment resolver syntax to relate a comment to post by passing in the postId
 2019-04-17 20:27:35 -03:00
Matt Rider
f4744fa513 Remove unused import, variables, set debug to false 2019-04-17 18:37:44 -03:00
Robert Schäfer
91e11eb14d Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-17 20:23:24 +02:00
Matt Rider
4dc39a97a8 Fix seeds 2019-04-17 12:51:30 -03:00
Robert Schäfer
b126b9b4bc
Merge pull request #476 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.17.2 
Bump eslint-plugin-import from 2.17.1 to 2.17.2 in /backend
 2019-04-17 17:48:16 +02:00
Matt Rider
f46e5ee58c Use custom resolver 
- add postId to type Comment
- remove it from params to create node without postId
- fix tests

Co-authored-by: Robert Schäfer <roschaefer@users.noreply.github.com>
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
Co-Authored-By: Mike Aono <aonomike@gmail.com>
 2019-04-17 11:27:26 -03:00
dependabot[bot]
d09755241e
Bump eslint-plugin-import from 2.17.1 to 2.17.2 in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.1 to 2.17.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.1...v2.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-17 12:29:51 +00:00
Matt Rider
0bcfefe210 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-17 08:00:07 -03:00
Robert Schäfer
7a8617f901 Merge remote-tracking branch 'origin/master' into docs-improve_installation_instructions 2019-04-17 12:15:02 +02:00
Robert Schäfer
2d85e5496d
Merge pull request #449 from Human-Connection/219-refactor-follow-shout-mutations 
refactor follow, unfollow, shout, unshout to custom mutations, but don't add date-time to relation yet
 2019-04-17 11:35:47 +02:00
Matt Rider
c519bff743 Fix lint 2019-04-16 23:37:11 -03:00
Matt Rider
dd9383ef40 Create two custom resolvers, get working with front end 
- Had difficulty adding a relationship with one custom resolver, if id for comment was not passed in, the comment was not created, hard coding it in also wasn't a good solution
 2019-04-16 23:12:13 -03:00
Matt Rider
9bc0c0f92c Add tests, create comments only when authenticated 2019-04-16 20:31:34 -03:00
Matt Rider
dfef4fe05f Add custom resolver, update factories 2019-04-16 19:48:59 -03:00
Robert Schäfer
fe551ece47 Create notifications on UpdatePost, too 
Note that we don't create duplicate notifications. I made use of the behaviour
of XSS-middleware: It removes all css classes from `<a>` anchors. Because
notifications rely on a css class `mention` which gets removed in a later
middleware, this gives us a nice behaviour for re-notifications without creating
duplicates. The downside is that it creates dependencies between middlewares and
it's not that obvious at all.

cc @mattwr18 @ulfgebhardt @appinteractive @Tirokk
 2019-04-17 00:08:21 +02:00