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
6,159 Commits 117 Branches 1,511 Tags
Commit Graph

6159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
3744d73465
Merge pull request #1770 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.0 
Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp
 2019-09-30 17:46:03 +02:00
roschaefer
0e2a0af7bf feat: no primary button for unread notifications 
@Tirokk if find this better, because a primary button always wants to be
clicked.
 2019-09-30 17:24:57 +02:00
Wolfgang Huß
78b43b05a4 Next step 2019-09-30 13:34:11 +02:00
Wolfgang Huß
eb6226f42d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-09-30 11:53:27 +02:00
Mike Aono
5f475e9aef
Merge pull request #1772 from Human-Connection/1706_refactor-shout-spec 
Fix failing test
 2019-09-30 12:47:18 +03:00
Wolfgang Huß
59b8a6ce54
Delete LF 2019-09-30 11:33:21 +02:00
Wolfgang Huß
ab3a5f0523
Haven’t seen this is already in master 2019-09-30 11:31:36 +02:00
aonomike
ff91cb231f Refactor it clauses 2019-09-30 11:33:59 +03:00
aonomike
5bcfb06511 Make clearDatabase() await 2019-09-30 11:22:12 +03:00
Wolfgang Huß
9a4187a6af Remove update on hover and click by Roberts suggestion 2019-09-30 10:15:56 +02:00
Wolfgang Huß
e24d08f35b Follow Roberts sorting suggestion 2019-09-30 10:06:51 +02:00
Wolfgang Huß
dc0b8d69a2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1637-notifications-self-update 2019-09-30 09:56:25 +02:00
dependabot-preview[bot]
ba22b7cca6
Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.27.0 to 1.28.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.27.0...tiptap-extensions@1.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:31:25 +00:00
dependabot-preview[bot]
de3b8bddf3
Bump date-fns from 2.3.0 to 2.4.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.3.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:31:11 +00:00
dependabot-preview[bot]
dbdd03082a
Bump graphql-middleware-sentry from 3.2.0 to 3.2.1 in /backend 
Bumps [graphql-middleware-sentry](https://github.com/BrunoScheufler/graphql-middleware-sentry) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/BrunoScheufler/graphql-middleware-sentry/releases)
- [Commits](https://github.com/BrunoScheufler/graphql-middleware-sentry/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:30:39 +00:00
dependabot-preview[bot]
644d9e6858
Bump metascraper-video from 5.7.5 to 5.7.6 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.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.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:29:42 +00:00
dependabot-preview[bot]
979534b68a
Bump apollo-server from 2.9.3 to 2.9.4 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.3 to 2.9.4.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.3...apollo-server@2.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:29:20 +00:00
dependabot-preview[bot]
d0eb37958e
Bump metascraper-image from 5.7.5 to 5.7.6 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.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.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:28:25 +00:00
dependabot-preview[bot]
6a50ebf4e3
Bump metascraper-title from 5.7.5 to 5.7.6 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.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.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:27:47 +00:00
dependabot-preview[bot]
d635b64eec
Bump nodemon from 1.19.2 to 1.19.3 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.2 to 1.19.3.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.2...v1.19.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:27:07 +00:00
mattwr18
37f447b670
Merge pull request #1755 from Human-Connection/move_storybook_docs 
docs: moves storybook into webapp/README.md
 2019-09-29 23:01:02 +02:00
Vasily Belolapotkov
d33fb8f745 fix email transport config 2019-09-29 21:13:34 +03:00
Vasily Belolapotkov
2c705a8680 sync with master to resolve merge conflicts 2019-09-29 20:33:39 +03:00
Vasily Belolapotkov
247efb691a
Merge pull request #1756 from Human-Connection/1273-fix-post-page-nav-suggestions 
1273 fix post page nav suggestions
- remove scrollBehaviour from nuxt.config.js
- extract scroll to anchor behaviour into reusable mixin
 2019-09-29 20:23:27 +03:00
dependabot-preview[bot]
2ad375497d
Bump @babel/node from 7.6.1 to 7.6.2 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.6.1 to 7.6.2.
- [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.6.1...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-29 15:45:04 +00:00
Robert Schäfer
a883eb3a1e
Merge pull request #1728 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.2 
Bump @babel/core from 7.6.0 to 7.6.2 in /backend
 2019-09-29 17:43:01 +02:00
roschaefer
57598df228 refactor: re-use @vbelolapotkov's solution 
If we make this a mixin, we can re-use the same solution for e.g. the
comment. If sb. notifies you, the browser automatically scrolls to the
comment in which you have been mentioned.
 2019-09-29 14:28:38 +02:00
roschaefer
b9c0749334 fix: scroll to top as default 
So nuxt's default scrollBehavior seems to have some kind of "scroll to
anchor" already built in. Unfortunately we cannot use it, because the
the anchor is not yet in the DOM when the scroll behavior is called.

So the justification for this change is:
1. Remove scrollBehavior from `nuxt.config.js` it's deprecated to put it
there.
2. Also *don't* use the default scrollbehavior because of the reasons
above ☝️

Instead I assume to always scroll to the top. This might be undesired
sometimes but let's keep a watchful eye and define the behavior if
needed.
 2019-09-29 14:28:38 +02:00
roschaefer
0f7bfea1b0 docs: moves storybook into webapp/README.md 
It makes much more sense to put it under the webapp's README than backend.

FYI: @mattwr18
 2019-09-29 00:15:43 +02:00
Robert Schäfer
67dde07b67
Merge pull request #1712 from Human-Connection/1706_refactor-shout-spec 
[WIP]1706 refactor shout spec
 2019-09-29 00:03:03 +02:00
Robert Schäfer
3087231a5f
Merge pull request #1671 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.4 
Bump cypress-file-upload from 3.3.3 to 3.3.4
 2019-09-28 23:48:13 +02:00
dependabot-preview[bot]
2dd47dbdc2
Bump @babel/core from 7.6.0 to 7.6.2 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 21:47:59 +00:00
Robert Schäfer
1f9e61b6b3
Merge pull request #1673 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.4 
Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend
 2019-09-28 23:47:55 +02:00
Robert Schäfer
b923b485f1
Merge pull request #1700 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.7.5 
Bump metascraper-description from 5.7.4 to 5.7.5 in /backend
 2019-09-28 23:47:19 +02:00
Robert Schäfer
139bb9c11f
Merge pull request #1713 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.2 
Bump @babel/cli from 7.6.0 to 7.6.2 in /backend
 2019-09-28 23:46:03 +02:00
Robert Schäfer
f5a3a44305
Merge pull request #1717 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.4 
Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend
 2019-09-28 23:45:48 +02:00
Robert Schäfer
935bf13ac8
Merge pull request #1752 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.4.0 
Bump date-fns from 2.2.1 to 2.4.0 in /webapp
 2019-09-28 23:45:25 +02:00
dependabot-preview[bot]
acf3102a7c
Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.2 to 16.1.4.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.2...v16.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:15:09 +00:00
dependabot-preview[bot]
fcc10d11ca
Bump metascraper-description from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [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.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:56 +00:00
dependabot-preview[bot]
f52980dade
Bump cypress-file-upload from 3.3.3 to 3.3.4 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.3...v3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:43 +00:00
dependabot-preview[bot]
cfcc17abb6
Bump @babel/cli from 7.6.0 to 7.6.2 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:43 +00:00
dependabot-preview[bot]
61f24dcfed
Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.3 to 2.9.4.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.3...apollo-server-testing@2.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:41 +00:00
dependabot-preview[bot]
1e9bd2acc6
Bump date-fns from 2.2.1 to 2.4.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.2.1 to 2.4.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.2.1...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 13:38:05 +00:00
Robert Schäfer
7ab411bed8
Merge pull request #1729 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.8 
Bump graphql from 14.5.7 to 14.5.8 in /webapp
 2019-09-28 15:35:14 +02:00
Robert Schäfer
520dfe8745
Merge pull request #1655 from Human-Connection/dependabot/npm_and_yarn/backend/mustache-3.1.0 
Bump mustache from 3.0.3 to 3.1.0 in /backend
 2019-09-28 15:34:40 +02:00
Robert Schäfer
bcb7865ba1
Merge pull request #1749 from Human-Connection/try-to-fix-vscode-format-works-against-eslint 
🍰 Try to fix VSCode format works against ESLint
 2019-09-28 15:34:00 +02:00
Robert Schäfer
f3ecb5c4fc
Merge pull request #1688 from Human-Connection/configure-docker-to-work-with-storybook 
Configure docker to work with storybook
 2019-09-28 15:30:57 +02:00
Robert Schäfer
91554b5d1f
Merge pull request #1750 from Human-Connection/neo4j-docker-config 
update neo4j docker-compose config
 2019-09-28 15:27:21 +02:00
roschaefer
489e9281f7 fix: Github's security vulnerability warning 
We use an unmaintained package called `activitystrea.ms` for the
activity pub middleware. Since the activity pub middleware is dead code
at the moment I suggest that we remove that package and disable all the
code that depends on the package.

When we get back to implement the ActivityPub spec for Human Connection I
would suggest to maintain this package `activitystrea.ms`, update the
dependencies there and re-enable and **test** the code of the activity pub
middleware.
 2019-09-28 14:41:47 +02:00
Vasily Belolapotkov
8c01f1d332 update neo4j docker config 2019-09-28 12:14:04 +03:00