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

5784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
ade92e387d Add slug to User component, fix #1486 2019-09-18 17:15:01 +02:00
Robert Schäfer
d20ed1a289
Merge pull request #1636 from Human-Connection/datenbrei-fixed-typo-neuste 
Update de.json
 2019-09-18 17:13:56 +02:00
aonomike
ca970eb30a Refactor disable post updates disabled 2019-09-18 17:59:29 +03:00
aonomike
e109b5f6b1 Refactor disable post updates disabledBy 2019-09-18 17:51:35 +03:00
roschaefer
7da49ea54a Fix storybook 2019-09-18 16:31:50 +02:00
aonomike
84c1d8ef25 Refactor to eliminate duplicate code and start implementing refactor for Post 2019-09-18 17:31:24 +03:00
Alina Beck
96ced53843 fix hover effect for language toggle 2019-09-18 15:16:53 +01:00
Alina Beck
5b8d2eb2f6 fix lint errors 2019-09-18 14:49:39 +01:00
Martin Döring
e5f9c8c650
Update de.json 
Fixed an minor typo. "Neuste" -> "Neueste"
 2019-09-18 15:45:07 +02:00
Alina Beck
b3deea4918 add language toggle 2019-09-18 14:39:03 +01:00
roschaefer
41aee3af33 Exclude broken maintenance-worker docker image 
The Dockerfile is still using `apk` instead of `apt-get` (Debian slim).
So that's why our build server was never successfully pushing the
`maintenance-worker` image.
 2019-09-18 15:14:22 +02:00
dependabot-preview[bot]
0b997e24e8
Bump @storybook/addon-actions from 5.2.0 to 5.2.1 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.1/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 12:43:42 +00:00
Robert Schäfer
92e2f6997f
Merge pull request #1621 from Human-Connection/dependabot/npm_and_yarn/cross-env-6.0.0 
Bump cross-env from 5.2.1 to 6.0.0
 2019-09-18 14:41:28 +02:00
Robert Schäfer
f4afda0e4c
Merge pull request #1624 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.1 
Bump @storybook/vue from 5.2.0 to 5.2.1 in /webapp
 2019-09-18 14:41:15 +02:00
Robert Schäfer
efd103c158
Merge pull request #1618 from Human-Connection/1547-fix-disappearing-comment-embeds 
Fix disappearing embeds on comments
 2019-09-18 14:40:02 +02:00
Robert Schäfer
6749e6a9e0
Merge pull request #1630 from Human-Connection/fix-for-blank-about 
Fix bug where about must not be empty string
 2019-09-18 14:39:46 +02:00
ogerly
75ea8eaaf0 Provider list approval hard cut 2019-09-18 14:03:51 +02:00
mattwr18
e89aff1272 Fix bug where about must not be empty string 
- add test case to test this use case since it is the default from our
UI
 2019-09-18 13:09:33 +02:00
Wolfgang Huß
7af247f1d9
Merge pull request #1615 from Human-Connection/links_to_imprint_and_privacy_policy_changed_to_human-connection.org 
links_to_imprint_and_privacy_policy_changed_to_human-connection.org
 2019-09-18 11:54:09 +02:00
dependabot-preview[bot]
b01f73e0ba
Bump @storybook/vue from 5.2.0 to 5.2.1 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.1/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 08:45:26 +00:00
dependabot-preview[bot]
82561d1a0c
Bump cross-env from 5.2.1 to 6.0.0 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.1 to 6.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/v5.2.1...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 08:43:33 +00:00
Robert Schäfer
643a7773c0
Merge pull request #1627 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.1 
Bump @storybook/addon-a11y from 5.2.0 to 5.2.1 in /webapp
 2019-09-18 10:42:50 +02:00
Robert Schäfer
900e3691d5
Merge pull request #1623 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-6.0.0 
Bump cross-env from 5.2.1 to 6.0.0 in /backend
 2019-09-18 10:41:56 +02:00
Robert Schäfer
4c301cf0a1
Merge pull request #1626 from Human-Connection/dependabot/npm_and_yarn/webapp/cross-env-6.0.0 
Bump cross-env from 5.2.1 to 6.0.0 in /webapp
v0.1.0 		2019-09-18 10:41:42 +02:00
ogerly
b5cc716475 Merge branch 'links_to_imprint_and_privacy_policy_changed_to_human-connection.org' of https://github.com/Human-Connection/Human-Connection into links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-18 10:12:07 +02:00
ogerly
c23212b306 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-18 10:10:59 +02:00
ogerly
94599c624b Delete dead code 2019-09-18 10:10:24 +02:00
mattwr18
b1003d8685 Disable tests because of difficulty testing tiptap 2019-09-18 08:56:41 +02:00
Vasily Belolapotkov
7d048b029d return user from follow/unfollow mutation 2019-09-18 09:49:59 +03:00
dependabot-preview[bot]
c39d905cc7
Bump @storybook/addon-a11y from 5.2.0 to 5.2.1 in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.1/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 04:23:05 +00:00
dependabot-preview[bot]
f3b1a7636b
Bump cross-env from 5.2.1 to 6.0.0 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.1 to 6.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/v5.2.1...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 04:22:31 +00:00
dependabot-preview[bot]
670dd919be
Bump cross-env from 5.2.1 to 6.0.0 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.1 to 6.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/v5.2.1...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 04:20:14 +00:00
dependabot-preview[bot]
1f7f264718
Bump @hapi/joi from 16.0.1 to 16.1.1 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.0.1 to 16.1.1.
- [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.0.1...v16.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 04:19:14 +00:00
mattwr18
e4533015bd
Merge pull request #1619 from Human-Connection/dont_create_accounts_for_unverified_users 
Don't create accounts for unverified users
 2019-09-17 22:58:20 +02:00
dependabot-preview[bot]
f9b310d358
Bump metascraper-author from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [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.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-17 20:16:32 +00:00
Robert Schäfer
ecf353d3bc
Merge pull request #1611 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.7.4 
Bump metascraper-title from 5.7.0 to 5.7.4 in /backend
 2019-09-17 22:14:38 +02:00
Robert Schäfer
cb1d13f2a6
Merge pull request #1617 from Human-Connection/1616_resend_registration_mail 
Resend registration mail if user has not yet registered
 2019-09-17 22:14:13 +02:00
roschaefer
af3bdaef52 Don't create accounts for unverified users 2019-09-17 19:16:56 +02:00
aonomike
3e7e240392 Refactor it updates disabled test for Comment 2019-09-17 18:59:21 +03:00
mattwr18
fd8cec55ad Fix disappearing embed on comments 
- by passing the prop content to the content-viewer with the comments
content if it is less than 180 characters or if it's different from the
contentExcerpt
 2019-09-17 17:50:40 +02:00
roschaefer
a8dded2263 Fix #1616 2019-09-17 17:47:26 +02:00
aonomike
5c06ba39e2 Refactor moderate Comment tests 2019-09-17 18:46:45 +03:00
dependabot-preview[bot]
471f94799e
Bump metascraper-title from 5.7.0 to 5.7.4 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.0 to 5.7.4.
- [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.0...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-17 14:42:44 +00:00
Robert Schäfer
321e50d20c
Merge pull request #1609 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.5.6 
Bump graphql from 14.5.4 to 14.5.6 in /backend
 2019-09-17 16:42:00 +02:00
Robert Schäfer
092bbae573
Merge pull request #1608 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.4.0 
Bump eslint from 6.3.0 to 6.4.0 in /backend
 2019-09-17 16:41:28 +02:00
Robert Schäfer
d16c27893c
Merge pull request #1607 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc13 
Bump @nuxtjs/apollo from 4.0.0-rc12 to 4.0.0-rc13 in /webapp
 2019-09-17 16:41:14 +02:00
Robert Schäfer
34dd22486a
Merge pull request #1606 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.7.4 
Bump metascraper-publisher from 5.6.6 to 5.7.4 in /backend
 2019-09-17 16:40:45 +02:00
Robert Schäfer
43cc907078
Merge pull request #1605 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.2.1 
Bump date-fns from 2.1.0 to 2.2.1 in /backend
 2019-09-17 16:40:29 +02:00
Robert Schäfer
3720ddbe33
Merge pull request #1604 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.7.4 
Bump metascraper-audio from 5.6.6 to 5.7.4 in /backend
 2019-09-17 16:40:09 +02:00
Robert Schäfer
b713fd699a
Merge pull request #1603 from Human-Connection/roschaefer-patch-1 
Add CodeTriage helpers badge
 2019-09-17 16:39:55 +02:00