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

5760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
e4c7c1125d zwischenspeichern 2019-09-23 09:11:41 +02:00
Alexander Friedland
006d6e8eeb
Merge pull request #1646 from Human-Connection/changelog 
Point the changelog to Github
 2019-09-19 20:19:26 +02:00
Robert Schäfer
7759d1b98a
Merge pull request #1647 from Human-Connection/Provider_list_approval_hard_cut 
Provider list approval hard cut
 2019-09-19 19:56:01 +02:00
ogerly
b75ebfd004 edit providerlist + test all provider 2019-09-19 18:46:44 +02:00
Robert Schäfer
d830fa4ae4
Merge pull request #1596 from Human-Connection/1583-follow-mutation 
Improve follow/ufollow mutation
 2019-09-19 16:54:35 +02:00
Robert Schäfer
f85884bc4f
Merge pull request #1648 from Human-Connection/fix-comments-list-styling 
Fix styling issue in comments list
 2019-09-19 16:35:23 +02:00
mattwr18
0430ab0f74 Fix styling issue in comments list 
- add back class comments which adds spaces between comments
 2019-09-19 15:57:57 +02:00
Robert Schäfer
5ef5947760
Merge pull request #1643 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.1 
Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /webapp
 2019-09-19 13:53:01 +02:00
Robert Schäfer
d992cbd9a0
Merge pull request #1642 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-prettier-3.1.1 
Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /backend
 2019-09-19 13:52:47 +02:00
roschaefer
b761eea700 Point the changelog to Github 
The justification for this change is that the releases page on Github
is more likely to keep up to date than our changelog.

This also means that our changelog is not translated. But I think that's
fine.
 2019-09-19 13:21:51 +02:00
Wolfgang Huß
1fe4ae6619
Merge pull request #1599 from Human-Connection/configure-emails 
Configure emails
 2019-09-19 11:21:18 +02:00
Vasily Belolapotkov
39db954ec6 improve follow/unfollow mutation usage 2019-09-19 12:10:59 +03:00
Alina Beck
b25d552193 follow @Tirokk and @datenbrei suggestions 2019-09-19 09:52:47 +01:00
mattwr18
f3c44711e4
Merge pull request #1641 from Human-Connection/1639_no_limits_for_post_length 
Fix #1639 - No limits for post length
 2019-09-19 09:16:57 +02:00
dependabot-preview[bot]
f8cad0d202
Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.0...v3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-19 04:21:21 +00:00
dependabot-preview[bot]
f13b6cb83b
Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /backend 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.0...v3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-19 04:21:01 +00:00
Alina Beck
e843edeb13 unite email templates in templateBuilder 2019-09-19 01:15:52 +01:00
Alina Beck
a7d525deab refactor password reset 2019-09-19 00:55:06 +01:00
Alina Beck
b193e180c5 add wrong account html template 2019-09-19 00:42:42 +01:00
Alina Beck
e45948f4f0 use password reset template 2019-09-19 00:23:51 +01:00
Alina Beck
2bd7276523 improve padding 2019-09-19 00:14:13 +01:00
Alina Beck
a304dcbfdf add reset password template 2019-09-19 00:06:57 +01:00
roschaefer
6a3d534ead Fix #1639 2019-09-19 01:05:43 +02:00
mattwr18
edca30b17e
Merge pull request #1635 from Human-Connection/exclude_maintenance_worker_docker_image 
Exclude broken maintenance-worker docker image
 2019-09-19 00:44:52 +02:00
Robert Schäfer
0e22be00c7
Merge pull request #1640 from Human-Connection/1486_make_slug_more_usable 
1486 make slug more usable
 2019-09-19 00:42:41 +02:00
Robert Schäfer
2f2011e068
Merge pull request #1610 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.7.4 
Bump metascraper-author from 5.6.6 to 5.7.4 in /backend
 2019-09-18 23:58:17 +02:00
Robert Schäfer
615a44a926
Merge pull request #1622 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.1 
Bump @hapi/joi from 16.0.1 to 16.1.1 in /backend
 2019-09-18 23:57:56 +02:00
Robert Schäfer
97df38639d
Merge pull request #1625 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.1 
Bump @storybook/addon-actions from 5.2.0 to 5.2.1 in /webapp
 2019-09-18 23:57:38 +02:00
roschaefer
ec7d9753db Follow @alina-beck's PR review 
https://github.com/Human-Connection/Human-Connection/pull/1640#pullrequestreview-290089879
 2019-09-18 23:32:10 +02:00
Alina Beck
ec0cf36256 refactor email middleware 2019-09-18 18:00:34 +01:00
roschaefer
af24693be4 Fix lint 2019-09-18 18:18:13 +02:00
roschaefer
85f1773211 Add slug to user profile page 2019-09-18 17:15:04 +02:00
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
roschaefer
7da49ea54a Fix storybook 2019-09-18 16:31:50 +02: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