Commit Graph

622 Commits

Author SHA1 Message Date
f24f4857b2 Merge pull request 'newsletter die 2.' (#99) from newsletter into main
Reviewed-on: #99
2022-05-24 22:35:09 +02:00
6ed57b199a Merge branch 'main' into newsletter 2022-05-24 22:34:32 +02:00
rev0lverheld
fa4ab74eaa Typo gefixt 2022-05-24 22:34:06 +02:00
b44896e1d0 Anreißer für Newsletter vom Mai hinzugefügt. 2022-05-24 21:55:19 +02:00
ea03943aa5 Anreißer für Newsletter vom März hinzugefügt. 2022-05-24 21:47:20 +02:00
4de9ee599c Anreißer für Newsletter vom Februar hinzugefügt. 2022-05-24 21:41:05 +02:00
e842fc0e03 Merge pull request 'newsletter' (#97) from newsletter into main
Reviewed-on: #97
2022-05-24 21:26:59 +02:00
rev0lverheld
206e219072 Newsletter vom 13.05.2022 hinzugefuegt 2022-05-24 21:21:22 +02:00
rev0lverheld
da58f8382e Newsletter vom 24.03.2022 hinzugefuegt 2022-05-24 21:17:50 +02:00
rev0lverheld
0aecd7bade Newsletter vom 10.02.2022 hinzugefuegt 2022-05-24 21:14:07 +02:00
2e4f70ac9d Merge pull request 'Update der PGP-Keys' (#96) from Brain/webseite:update-keys-20220506 into main
Reviewed-on: #96
2022-05-08 11:13:32 +02:00
bb75a9a478
Update keys 2022-05-06 16:56:09 +02:00
358fd5914c Merge pull request 'Happy new year!' (#95) from zeitschlag/webseite:2022 into main
Reviewed-on: #95

Dankeschön.
2022-04-19 23:32:54 +02:00
9b95d7b7bd „LICENCE“ ändern 2022-04-19 22:30:32 +02:00
182d19ecc6 Fix year in layout 2022-04-19 22:14:34 +02:00
55ba6178f4 Merge pull request 'feat: Added Vorstand + Aufsichtsratsvorsitz to footer.' (#94) from #93_aufsichtsrat_vorsitzender into main
Reviewed-on: #94

Zumindest gab es nach über einer Woche live auf der Seite keine Klagen :)
2022-03-05 21:32:42 +01:00
7f0682de99 feat: Added Aufsichtsratsvorsitz to Impressum. 2022-02-24 22:15:43 +01:00
b16681df37 feat: Added Vorstand + Aufsichtsratsvorsitz to footer. 2022-02-22 20:46:21 +01:00
f1e3f6e9ad Merge pull request 'PGP-Keys aktualisiert' (#92) from Brain/webseite:update-keys into main
Reviewed-on: #92
2022-02-08 22:09:24 +01:00
bf9b5ee7cd Update key 2022-02-03 14:25:08 +01:00
c87ba21e32 Update key 2022-02-03 14:23:22 +01:00
9117593475 Merge pull request 'docs: Teaser hinzugefügt.' (#91) from newsletter_nov_2021 into main
Reviewed-on: #91
2021-11-17 21:38:06 +01:00
dc218e657a Merge branch 'main' into newsletter_nov_2021 2021-11-17 21:37:47 +01:00
Stephan
dbe7acb424 docs: Teaser hinzugefügt. 2021-11-17 21:36:04 +01:00
453df138fe Merge pull request 'Newsletter November 2021 hinzugefügt' (#90) from newsletter_nov_2021 into main
Reviewed-on: #90

Hab noch ein paar Kleinigkeiten (teilweise schon in den Anmerkungen) gefixt.
2021-11-17 21:27:54 +01:00
Stephan
4bb3fd2e67 fix: Klein nach Gedankenstrich, Überschrift ausgezeichnet, Anreden groß 2021-11-17 21:26:19 +01:00
ac99c3e1a2 missing comma added, genossenschafts-intern->genossenschaftsintern 2021-11-17 09:35:54 +01:00
rev0lverheld
4e50a4fd28 Newsletter November 2021 hinzugefügt 2021-11-16 20:56:24 +01:00
674f9e159b Merge pull request 'fix: Removed doubled content from page Mitglieder (#88)' (#89) from #88_doppelter_text_auf_seite_mitglieder into main
Reviewed-on: #89
2021-11-10 20:58:21 +01:00
Stephan
b056e8c1a4 fix: Removed doubled content from page Mitglieder (#88) 2021-11-10 20:56:08 +01:00
3334c87544 Merge pull request 'wording' (#87) from vv01f/wtf-webseite:main into main
Reviewed-on: #87

Find ich gut. Geht gleich live.
2021-11-10 20:42:45 +01:00
aedaef3d3a wording
wg. Rückfrage ob der Nickname im Ausweis stehen muss und ob andere Personaldokumente zählen
2021-11-04 09:55:48 +01:00
4ea9f45f6f Merge pull request 'feat: added missing meta description for blog posts' (#85) from blog_intros into main
Reviewed-on: #85
Reviewed-by: rev0lverheld <rev0lverheld@noreply.git.wtf-eg.de>
2021-10-20 09:48:05 +02:00
Stephan
33c7f2de34 feat: added missing meta description for blog posts
this is shown as a preview on /aktuelles/
2021-10-16 12:57:19 +02:00
f4ddb423e5 Merge pull request 'Newsletter vom 28.09.2021 hinzugefügt' (#84) from september_newsletter into main
Reviewed-on: #84
2021-10-13 22:42:33 +02:00
rev0lverheld
0bedcad4c7 Newsletter vom 28.09.2021 hinzugefügt 2021-10-13 22:36:05 +02:00
90d4e5b86d Merge pull request 'feat: added podcast episode 6 of season 2' (#83) from podcast_s02e06 into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #83

Gerade gesehen, dass es mehrere Episoden ohne Chapterfile gibt. Wird also wohl nicht gleich explodieren.
2021-09-09 18:50:29 +02:00
Stephan
6aac5edb68 feat: added podcast episode 6 of season 2
All checks were successful
continuous-integration/drone/pr Build is passing
2021-09-09 18:45:04 +02:00
73ee29f497 Merge pull request 'fix: changed podcast logo to avoid white on transparent background' (#81) from white_podcast_logo_fix into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #81
2021-09-04 09:43:14 +02:00
1e247ed871 Merge branch 'main' into white_podcast_logo_fix
All checks were successful
continuous-integration/drone/pr Build is passing
2021-09-04 09:38:33 +02:00
Stephan
a862e78b57 fix: changed podcast logo to avoid white on transparent background
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
Added podcast title to image
2021-08-29 11:08:47 +02:00
1872300f55 Merge pull request 'fix: attempt to configure separate pipelines for prs and pushes to main' (#79) from drone_pipline_separation into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #79
2021-08-18 15:48:11 +02:00
Stephan
6eac032d6f fix: attempt to configure separate pipelines for prs and pushes to main
All checks were successful
continuous-integration/drone/pr Build is passing
Atm. two builds are created which lead to the missing recognition of the success of one of the builds.
2021-08-18 15:41:14 +02:00
eb86308602 Merge pull request '„content/mitglieder/beitreten/contents.lr“ ändern' (#75) from mrschizo-patch-2 into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #75
2021-08-08 19:39:04 +02:00
57a700c90c Merge branch 'main' into mrschizo-patch-2
Some checks are pending
continuous-integration/drone/pr Build is running
continuous-integration/drone/push Build is passing
2021-08-08 19:34:58 +02:00
7e2c20a804 Merge pull request 'Newsletter 07/2021 einpflegen' (#76) from mrschizo-patch-3 into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #76

Habe noch ein paar Kleinigkeiten gefixt und stelle den Blogpost jetzt so online.

continuous-integration/drone/push wir mir noch als running angezeigt unter Details ist aber alles fertig und grün, soweit ich das sehe. Ich merge das jetzt :)
2021-08-04 22:45:13 +02:00
Stephan
b4fd1eff61 fix: typo
Some checks are pending
continuous-integration/drone/push Build is running
continuous-integration/drone/pr Build is passing
2021-08-04 22:32:32 +02:00
Stephan
9a4f92c4a7 fix: removed left over 'auf' and shortened pw reset link. 2021-08-04 22:32:16 +02:00
Stephan
db503f0367 fix: capitalization of salutation 2021-08-04 22:31:03 +02:00
Stephan
fdc27a4cca fix: changed wording specific to email newsletter 2021-08-04 22:20:32 +02:00