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
Alina Beck
e53609ab14 add german translation to signup template 2019-09-17 15:28:24 +01: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
Alina Beck
24fb601739 clean up email template 2019-09-17 15:17:36 +01:00
ogerly
a588a7bc12 links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-17 16:16:22 +02:00
Alina Beck
f483220590 use nodemailer-html-to-text plugin to transform html content to plain text 2019-09-17 14:27:10 +01:00
aonomike
a6f4362a3f Refactor Moderator spec tp use apollo-server-testing 
- Refactor unauthentiacted path for logged in and un logged in user
 2019-09-17 15:51:49 +03:00
Wolfgang Huß
1ec2990114
Merge pull request #1571 from Human-Connection/1276-hashtag-links-url-safe 
🍰 Make hashtag links URL safe
 2019-09-17 14:43:21 +02:00
Robert Schäfer
5466cf69b2
Merge pull request #1601 from Human-Connection/github_release_without_uploads 
Relase without any artifacts
 2019-09-17 13:52:54 +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
Wolfgang Huß
d28a1f17f1 Merge branch '1276-hashtag-links-url-safe' of https://github.com/Human-Connection/Human-Connection into 1276-hashtag-links-url-safe 2019-09-17 10:01:17 +02:00
Wolfgang Huß
b06b353f6a Corrected comment to unicode letter(s) 2019-09-17 09:58:35 +02:00
Vasily Belolapotkov
eeee5f8e9b refactor graphQL queries in follow spec 2019-09-17 10:50:03 +03:00
mattwr18
7926cb39ba Improve English descriptions 2019-09-17 08:50:22 +02:00
dependabot-preview[bot]
2d430ee72c
Bump graphql from 14.5.4 to 14.5.6 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.4 to 14.5.6.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.4...v14.5.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-17 04:25:24 +00:00
dependabot-preview[bot]
541cd371ac
Bump eslint from 6.3.0 to 6.4.0 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-17 04:23:37 +00: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]
9f4d1be37e
Bump metascraper-publisher from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-publisher](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 04:22:52 +00:00
dependabot-preview[bot]
a189b388d9
Bump date-fns from 2.1.0 to 2.2.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.1.0 to 2.2.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.1.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-17 04:22:13 +00:00
dependabot-preview[bot]
a8aee791df
Bump metascraper-audio from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-audio](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 04:21:41 +00:00
Robert Schäfer
01e4cf83e6
Add CodeTriage helpers badge 2019-09-17 02:28:53 +02:00
Robert Schäfer
793a4b7882
Merge pull request #1582 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.7.4 
Bump metascraper-image from 5.6.6 to 5.7.4 in /backend
 2019-09-17 02:17:16 +02:00
Robert Schäfer
98569fa9e1
Merge pull request #1587 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.0 
Bump @storybook/addon-a11y from 5.1.11 to 5.2.0 in /webapp
 2019-09-17 02:17:10 +02: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
dependabot-preview[bot]
e480c389ee
Bump metascraper-image from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-image](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-16 21:21:47 +00:00
Robert Schäfer
ca77d1bad4
Merge pull request #1574 from Human-Connection/dependabot/submodules/styleguide-808b3c5 
Bump styleguide from `793556a` to `808b3c5`
 2019-09-16 23:21:11 +02:00
Robert Schäfer
3c775b0bb5
Merge pull request #1578 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.7.4 
Bump metascraper-soundcloud from 5.6.7 to 5.7.4 in /backend
 2019-09-16 23:20:52 +02:00
Robert Schäfer
36adef2e8b
Merge pull request #1580 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.7.4 
Bump metascraper-video from 5.6.6 to 5.7.4 in /backend
 2019-09-16 23:20:38 +02:00
Robert Schäfer
2a0e5f7e2f
Merge pull request #1584 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.7.4 
Bump metascraper-date from 5.7.0 to 5.7.4 in /backend
 2019-09-16 23:20:06 +02:00
Robert Schäfer
4f6725c588
Merge pull request #1585 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.7.4 
Bump metascraper-lang from 5.6.6 to 5.7.4 in /backend
 2019-09-16 23:19:49 +02: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ß
15816dd97b Update backend/src/middleware/hashtags/hashtagsMiddleware.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-16 22:06:36 +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
roschaefer
f5b7130542 Relase without any artifacts 
I contributed to `ghr` here:
https://github.com/tcnksm/ghr/pull/118

Now after `ghr` does not need any artifacts to create a file, we can
stop uploading archives. (Use the default archives provided by Github)
 2019-09-16 21:17:23 +02:00
Alina Beck
c94715a128 pass options to html template 2019-09-16 18:29:43 +01:00
Alina Beck
dcbeed319d add and style links 2019-09-16 18:16:43 +01:00
mattwr18
bd0273f071
Merge pull request #1600 from Human-Connection/fix_docker_push_script 
Fix docker image tags
 2019-09-16 19:16:37 +02:00
Robert Schäfer
cb574dd850
Merge pull request #1595 from Human-Connection/1454-security-issue-comment-mutations 
Remove deleted/disabled/createdAt from Comment mutations
 2019-09-16 18:20:35 +02:00
roschaefer
0ccf7211b5 Fix docker image tags 2019-09-16 18:09:18 +02:00
Alina Beck
61ce27464c adapt template to follow human connection styleguide (wip) 2019-09-16 17:02:59 +01: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