Merge branch 'main' into update/privacy-policy-22

This commit is contained in:
Benjamin Bädorf 2022-12-09 13:11:28 +00:00
commit b9a9b15419
No known key found for this signature in database
GPG key ID: 5FEAFA6A0FC8075D
3 changed files with 33 additions and 3 deletions

View file

@ -19,6 +19,12 @@ content:
You can reach us via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [@crew on Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar).
You can find our PGP key [here](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). It has the following fingerprint:
```
8A89 87AD E373 6C8C A2EB 315A 9B80 9EBB DD62 BAE3
```
## Being a member or helping hand
Are you interested in becoming a member of the pub.solar organisation? Do you want to support the organisation with labour, money, or just your name?
@ -32,7 +38,15 @@ content:
## Imprint
pub.solar n.e.V.
Benjamin Bädorf, Jhonas Wernery, Hendrik Sokolowki
<script>
document.write(
'<p>' +
(['Benjamin Bädorf', 'Jhonas Wernery', 'Hendrik Sokolowki']
.sort(() => Math.random() - 0.5)
.join(', ')) +
'</p>'
);
</script>
c/o MiOM 202,
Wilhelm-Mauser-Straße 47 Halle 5,
D-50827 Köln,
@ -67,6 +81,12 @@ content:
Du kannst uns via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [@crew auf Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken.
Unseren PGP Schlüssel findest du [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). Er hat folgenden Fingerabdruck:
```
8A89 87AD E373 6C8C A2EB 315A 9B80 9EBB DD62 BAE3
```
## Mitglied oder Helfer*in werden
Bist du daran interessiert ein Mitglied von pub.solar n.e.V. zu werden? Du würdest die Organisation gerne mit Arbeit, Geld, oder einfach nur deinen Namen unterstützen?
@ -80,7 +100,15 @@ content:
## Impressum
pub.solar n.e.V.
Benjamin Bädorf, Jhonas Wernery, Hendrik Sokolowki
<script>
document.write(
'<p>' +
(['Benjamin Bädorf', 'Jhonas Wernery', 'Hendrik Sokolowki']
.sort(() => Math.random() - 0.5)
.join(', ')) +
'</p>'
);
</script>
c/o MiOM 202,
Wilhelm-Mauser-Straße 47 Halle 5,
D-50827 Köln,

View file

@ -1,7 +1,7 @@
import MarkdownIt from "https://jspm.dev/markdown-it";
const mdIt = new MarkdownIt({
html: false, // Enable HTML tags in source
html: true, // Enable HTML tags in source
xhtmlOut: false, // Use '/' to close single tags (<br />).
// This is only for full CommonMark compatibility.
breaks: true, // Convert '\n' in paragraphs into <br>

View file

@ -4,6 +4,8 @@ links:
- href: https://en.wikipedia.org/wiki/Free_software
title: Fucking Free
openInNewTab: true
- href: https://auth.pub.solar/realms/pub.solar/account
title: Your pub.solar ID
- href: https://cloud.pub.solar/
title: Nextcloud
openInNewTab: true