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

1607 Commits

Author SHA1 Message Date
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
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
Vasily Belolapotkov
39db954ec6 improve follow/unfollow mutation usage 2019-09-19 12:10:59 +03: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
roschaefer
6a3d534ead Fix #1639 2019-09-19 01:05:43 +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
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
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
roschaefer
7da49ea54a Fix storybook 2019-09-18 16:31:50 +02:00
Martin Döring
e5f9c8c650
Update de.json 
Fixed an minor typo. "Neuste" -> "Neueste"
 2019-09-18 15:45:07 +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
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
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
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
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
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
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
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
Alexander Friedland
4bed7435ec
update add backslash 2019-09-17 16:23:01 +02:00
Alexander Friedland
3f6cec8e27
update backslash 2019-09-17 16:22:12 +02:00
ogerly
a588a7bc12 links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-17 16:16:22 +02:00
roschaefer
2f90a45da7 Follow @Tirokk's review and fix a bug 
The bug happened because the hashtag link won't get parsed by the
extension. This is desired for mentions because you don't want to
re-notify a user if you haven't updated the text in which you notify
somebody. For hashtags this is undesired and would lead to transforming
the hashtag link into a normal link on the next edit of a post.
 2019-09-17 11:09:45 +02:00
Wolfgang Huß
b509a224ce Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1276-hashtag-links-url-safe 2019-09-17 10:16:35 +02:00
Wolfgang Huß
02c6bf70f3 Change the dummy domain to https://human-connection.org 2019-09-17 10:16:12 +02:00
dependabot-preview[bot]
e89ae1f8d5
Bump @nuxtjs/apollo from 4.0.0-rc12 to 4.0.0-rc13 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc12 to 4.0.0-rc13.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.12...v4.0.0-rc.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-17 04:22:55 +00:00
dependabot-preview[bot]
79d60aa231
Bump @storybook/addon-a11y from 5.1.11 to 5.2.0 in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.1.11 to 5.2.0.
- [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.0/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 21:21:53 +00:00
Robert Schäfer
90793921b5
Merge pull request #1589 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.0 
Bump @storybook/addon-actions from 5.1.11 to 5.2.0 in /webapp
 2019-09-16 23:19:03 +02:00
Robert Schäfer
92e2d30d7b
Merge pull request #1590 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.6 
Bump graphql from 14.5.4 to 14.5.6 in /webapp
 2019-09-16 23:18:40 +02:00
roschaefer
431de3319f Make data-hashtag-id authoritive for #links 
This adds consistency: The mention links with `@` was implemented
that way already. Instead of parsing the URL, we add some redundancy and
add another attribute: data-hashtag-id

So, what characters are valid for html attributes?
Read: https://stackoverflow.com/questions/925994/what-characters-are-allowed-in-an-html-attribute-name

Thanks to @Tirokk, who added some validations on the hahstag ids, I
think we are all set. If you try to write a hashtag with a `"` double
quotation mark for example, it gets automatically replaced with a valid
hashtag. If someone wants to send us invalid hashtag ids to the backend
directly, the regex there would filter it out.
 2019-09-16 23:09:32 +02:00
Wolfgang Huß
2ad4bb3476 Fix decodeURI on indexpage 2019-09-16 22:06:36 +02:00
Wolfgang Huß
7759e54fd4 Correct hashtag link routing 2019-09-16 22:06:36 +02:00
Wolfgang Huß
92df820323 Rename /admin/tags.vue to /admin/hashtags.vue 2019-09-16 22:06:36 +02:00
Wolfgang Huß
0157cc3700 Refactor routing of of hashtag links 2019-09-16 22:06:36 +02:00
Wolfgang Huß
ee8ce5a153 Comment clearification 2019-09-16 22:06:36 +02:00
Wolfgang Huß
82d5ac99df Make hashtag links URL safe 2019-09-16 22:06:36 +02:00
mattwr18
de0837bbd3
Merge pull request #1572 from Human-Connection/set_created_at_in_cypher 
Fix bug where Post.createdAt is sometimes null
 2019-09-16 14:38:13 +02:00
mattwr18
8205b2d986
Merge pull request #1594 from Human-Connection/fix_missing_images 
Fix missing images on staging
 2019-09-16 13:32:29 +02:00
Wolfgang Huß
590917160c
Merge pull request #1593 from Human-Connection/1501-missing-translations 
🍰  Missing translations
 2019-09-16 13:07:05 +02:00
roschaefer
4be3e2a0d0 Fix missing images on staging 2019-09-16 11:41:50 +02:00