IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,658 Commits 5 Branches 2 Tags
Commit Graph

5658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
7926cb39ba Improve English descriptions 2019-09-17 08:50:22 +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
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
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
f66d234e85 Fix lint 2019-09-16 13:41:10 +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
mattwr18
588ccfb08b
Merge pull request #1592 from Human-Connection/fix_docker_push_script 
Fix deployment script for docker images
 2019-09-16 13:03:53 +02:00
mattwr18
70c72e8f95 Remove deleted/disabled/createdAt from Comment mutations 2019-09-16 12:35:14 +02:00
roschaefer
4be3e2a0d0 Fix missing images on staging 2019-09-16 11:41:50 +02:00
Wolfgang Huß
22a005eb1c Show categories translated in all places and even in tooltips 
Show `#` symbol in front of hashtags.
Minor design changes on posts more info page.
 2019-09-16 11:14:13 +02:00
roschaefer
2948772d19 Fix deployment script for docker images 2019-09-16 10:21:44 +02:00
Wolfgang Huß
714c658844 Add hint translation to plus icon for creating posts 
- Position adjustment of the news feed plus icon in hight, because in desktop browsers it intersects the footer.
- Added shadow to plus icon on the user page.
 2019-09-16 10:20:36 +02:00
dependabot-preview[bot]
f0f6224cce
Bump @storybook/addon-actions from 5.1.11 to 5.2.0 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) 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/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:07:16 +00:00
mattwr18
14d1932a18
Merge pull request #1591 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.0.1 
Bump @hapi/joi from 15.1.1 to 16.0.1 in /backend
 2019-09-16 09:05:56 +02:00
dependabot-preview[bot]
293b597f44
Bump metascraper-date from 5.7.0 to 5.7.4 in /backend 
Bumps [metascraper-date](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-16 07:05:28 +00:00
mattwr18
c330bb2604
Merge pull request #1588 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/dotenv-1.4.1 
Bump @nuxtjs/dotenv from 1.4.0 to 1.4.1 in /webapp
 2019-09-16 09:05:27 +02:00
dependabot-preview[bot]
210166e10f
Bump metascraper-lang from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-lang](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 07:04:59 +00:00
dependabot-preview[bot]
2e2330f40f
Bump graphql from 14.5.4 to 14.5.6 in /webapp 
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-16 07:04:41 +00:00
mattwr18
d5cd18317f
Merge pull request #1586 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.0 
Bump @storybook/vue from 5.1.11 to 5.2.0 in /webapp
 2019-09-16 09:04:38 +02:00
dependabot-preview[bot]
dc9c27448a
Bump metascraper-soundcloud from 5.6.7 to 5.7.4 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.6.7 to 5.7.4.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:04:08 +00:00
dependabot-preview[bot]
54a6c34148
Bump metascraper-video from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-video](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 07:04:06 +00:00
mattwr18
7c1af36b9a
Merge pull request #1581 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.7.4 
Bump metascraper-description from 5.6.6 to 5.7.4 in /backend
 2019-09-16 09:03:21 +02:00
mattwr18
2d73308131
Merge pull request #1579 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.7.4 
Bump metascraper-logo from 5.6.6 to 5.7.4 in /backend
 2019-09-16 09:02:49 +02:00
mattwr18
e186502d55
Merge pull request #1577 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.7.4 
Bump metascraper-youtube from 5.6.7 to 5.7.4 in /backend
 2019-09-16 09:02:21 +02:00