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,749 Commits 5 Branches 2 Tags
Commit Graph

1279 Commits

Author SHA1 Message Date
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
Wolfgang Huß
1fe4ae6619
Merge pull request #1599 from Human-Connection/configure-emails 
Configure emails
 2019-09-19 11:21:18 +02:00
Alina Beck
b25d552193 follow @Tirokk and @datenbrei suggestions 2019-09-19 09:52:47 +01: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
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
Alina Beck
ec0cf36256 refactor email middleware 2019-09-18 18:00:34 +01: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
Alina Beck
b3deea4918 add language toggle 2019-09-18 14:39:03 +01: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
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
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
roschaefer
a8dded2263 Fix #1616 2019-09-17 17:47:26 +02: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
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
Alina Beck
e53609ab14 add german translation to signup template 2019-09-17 15:28:24 +01:00
Alina Beck
24fb601739 clean up email template 2019-09-17 15:17:36 +01: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
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ß
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
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]
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
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
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
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
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ß
82d5ac99df Make hashtag links URL safe 2019-09-16 22:06:36 +02:00
Alina Beck
c94715a128 pass options to html template 2019-09-16 18:29:43 +01:00