IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,451 Commits 5 Branches 2 Tags
Commit Graph

2377 Commits

Author SHA1 Message Date
mattwr18
4170e62f7a
Merge pull request #2608 from Human-Connection/1680-Direct_answer_on_Comment 
feat: 🍰 Direct Reply On Comment
 2020-01-31 16:30:29 +01:00
dependabot-preview[bot]
e3447d0776
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 13:27:08 +00:00
mattwr18
befbe83680
Merge pull request #2940 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /backend
 2020-01-31 14:25:09 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
dependabot-preview[bot]
a1625b47ec
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 11:44:14 +00:00
dependabot-preview[bot]
42bc556185
build(deps-dev): bump @babel/cli from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.8.3 to 7.8.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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:44:35 +00:00
dependabot-preview[bot]
45e3adc6ca
build(deps-dev): bump @babel/node from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.8.3 to 7.8.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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:21:17 +00:00
mattwr18
b47f46157c
Merge pull request #2714 from Human-Connection/1724-block-users 
feat: Blocked users cannot comment on posts
 2020-01-30 11:39:03 +01:00
dependabot-preview[bot]
f22d36dd21
build(deps): bump @sentry/node from 5.11.1 to 5.11.2 in /backend (#2927) 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.11.1 to 5.11.2.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.11.1...5.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-30 11:37:00 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
mattwr18
6cd10d78be
Merge pull request #2924 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.9 
build(deps): bump graphql-shield from 7.0.8 to 7.0.9 in /backend
 2020-01-29 10:01:35 +01:00
dependabot-preview[bot]
4b0adf3eeb
build(deps): bump graphql-shield from 7.0.8 to 7.0.9 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.8 to 7.0.9.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.8...v7.0.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 04:20:19 +00:00
dependabot-preview[bot]
cc6daa9bb9
build(deps-dev): bump eslint-config-prettier in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.9.0 to 6.10.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.9.0...v6.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 04:19:42 +00:00
Robert Schäfer
65811e2d8b
Merge pull request #2898 from Human-Connection/add_underline_menu_button 
feat(editor): Underline markup for posts+comments
 2020-01-28 22:34:30 +01:00
Robert Schäfer
d98b30fce1
Merge pull request #2919 from Human-Connection/2894-add-migration-for-muted-relationship 
fix(backend): Add migration for muted relationship
 2020-01-28 22:24:14 +01:00
mattwr18
d6a2f2d9e3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-27 20:08:37 +01:00
mattwr18
d6a5b7ce65 Update post factories with guard clause 2020-01-27 17:32:09 +01:00
mattwr18
d5d6dbec5c
Merge pull request #2907 from Human-Connection/dependabot/npm_and_yarn/backend/validator-12.2.0 
build(deps): bump validator from 12.1.0 to 12.2.0 in /backend
 2020-01-27 16:06:43 +01:00
mattwr18
b48b93dd0d Set up cypress test for direct reply to comment 2020-01-27 15:07:32 +01:00
mattwr18
5730d2ae93
Merge pull request #2911 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-7.0.0 
build(deps): bump cross-env from 6.0.3 to 7.0.0 in /backend
 2020-01-27 14:58:37 +01:00
dependabot-preview[bot]
45538c8b7a
build(deps): bump validator from 12.1.0 to 12.2.0 in /backend 
Bumps [validator](https://github.com/chriso/validator.js) from 12.1.0 to 12.2.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.1.0...12.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 12:31:35 +00:00
mattwr18
abbabee4c3
Merge pull request #2906 from Human-Connection/dependabot/npm_and_yarn/backend/slug-2.1.1 
build(deps): bump slug from 2.1.0 to 2.1.1 in /backend
 2020-01-27 13:29:35 +01:00
mattwr18
37178fd6ba Add migration for muted relationship 2020-01-27 13:28:12 +01:00
dependabot-preview[bot]
07bb82365b
build(deps): bump cross-env from 6.0.3 to 7.0.0 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.0.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 11:37:55 +00:00
dependabot-preview[bot]
cc213ede79
build(deps): bump slug from 2.1.0 to 2.1.1 in /backend 
Bumps [slug](https://github.com/Trott/node-slug) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Changelog](https://github.com/Trott/node-slug/blob/master/CHANGELOG)
- [Commits](https://github.com/Trott/node-slug/compare/v2.1.0...v2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 09:52:15 +00:00
dependabot-preview[bot]
70e9fb5069
build(deps): bump graphql from 14.5.8 to 14.6.0 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.8 to 14.6.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.8...v14.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 09:51:48 +00:00
dependabot-preview[bot]
c842dc4790
build(deps): bump graphql-shield from 7.0.7 to 7.0.8 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.7...v7.0.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 04:17:08 +00:00
roschaefer
789c40c34e feat(editor): Underline markup for posts+comments 
We had tiptap's underline and never used it. A user has asked for it, so
why not implement it right away?

Suggested by `@raimundo@human-connection.social`:
https://human-connection.social/post/612bf465-91ce-4be8-906e-3bde63617346/hcsocial-dein-netzwerk-news-mit-dennis-and-robert-1#commentId-b864d04f-1e8c-48c4-9ed0-98aefaed1c02
 2020-01-26 20:39:52 +01:00
mattwr18
1a93fcc023
Merge pull request #2893 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.10.6 
build(deps): bump metascraper-logo from 5.10.5 to 5.10.6 in /backend
 2020-01-24 13:03:16 +01:00
dependabot-preview[bot]
e95d47c638
build(deps): bump metascraper-logo from 5.10.5 to 5.10.6 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-24 09:24:21 +00:00
mattwr18
c85a7eb781
Merge pull request #2892 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.10.6 
build(deps): bump metascraper-video from 5.10.5 to 5.10.6 in /backend
 2020-01-24 10:23:06 +01:00
mattwr18
7f12b4d3f5
Merge pull request #2891 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.10.6 
build(deps): bump metascraper-image from 5.10.5 to 5.10.6 in /backend
 2020-01-24 10:22:47 +01:00
dependabot-preview[bot]
576733efd2
build(deps): bump metascraper-video from 5.10.5 to 5.10.6 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-24 04:18:29 +00:00
dependabot-preview[bot]
67a1e1047d
build(deps): bump metascraper-image from 5.10.5 to 5.10.6 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-24 04:18:09 +00:00
dependabot-preview[bot]
dc3333e2f0
build(deps): bump metascraper-publisher in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-24 04:17:35 +00:00
mattwr18
1057ac4cbe Merge branch 'neo4j_data_migrations' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-23 20:43:10 +01:00
mattwr18
f8f62cc71f Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-23 20:42:44 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature 
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2020-01-23 20:30:12 +01:00
dependabot-preview[bot]
42c08d4296 build(deps): bump metascraper from 5.10.5 to 5.10.6 in /backend (#2877) 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 20:23:05 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock 
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
 2020-01-23 19:18:12 +01:00
dependabot-preview[bot]
0196ad0d75 build(deps): bump metascraper-url from 5.10.5 to 5.10.6 in /backend (#2879) 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 18:01:07 +01:00
dependabot-preview[bot]
11af000a9b build(deps): bump metascraper-lang from 5.10.5 to 5.10.6 in /backend (#2882) 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 18:00:59 +01:00
dependabot-preview[bot]
1d24072372 build(deps): bump metascraper-audio from 5.10.5 to 5.10.6 in /backend (#2883) 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 18:00:53 +01:00
roschaefer
e343701057 Reverted a couple changes by @mattwr18 
We have to figure out if `mergeRels: true` is actually avoiding
duplicate relationships 🤔.

Before:
(l1)-[:IS_IN]->(l2)
(l1)-[:IS_IN]->(l3)

After:
(l1)-[:IS_IN]->(new)
(l1)-[:IS_IN]->(new)
 2020-01-23 17:38:31 +01:00
mattwr18
28dae1f854 Update docs, follow @roschaefer suggestions 
- create command should be run with --date-format to be more human
  readable, and --template-file to use our template instead of migrate's
default
- rename migrations
- rename createdAt to migratedAt to remove ambiguity
- do not merge relationships for Location nodes as we don't want to
  create duplicate relationships
- use singular locationId as it's iterating one at a time
 2020-01-23 15:44:34 +01:00
mattwr18
f6f8a41eaf Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-23 14:53:28 +01:00
dependabot-preview[bot]
c740f3ce8c build(deps): bump metascraper-date from 5.10.5 to 5.10.6 in /backend (#2878) 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 14:02:33 +01:00
dependabot-preview[bot]
b9a97af158 build(deps): bump metascraper-title from 5.10.5 to 5.10.6 in /backend (#2880) 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.10.5 to 5.10.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.5...v5.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 14:01:15 +01:00
mattwr18
5f3861b2cb
Merge pull request #2881 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.10.6 
build(deps): bump metascraper-youtube from 5.10.5 to 5.10.6 in /backend
 2020-01-23 11:32:50 +01:00