bobidle/webseite-krautspace
1
0
Fork 0
forked from Krautspace/webseite-krautspace
Code Pull requests Activity

Compare commits

merge into: bobidle:canonical
Branches Tags
bobidle:main
bobidle:span
bobidle:section
bobidle:office
bobidle:http_redirect
bobidle:canonical
Krautspace:main
...
pull from: Krautspace:main
Branches Tags
Krautspace:main
bobidle:main
bobidle:span
bobidle:section
bobidle:office
bobidle:http_redirect
bobidle:canonical

9 commits
canonical ... main

Author SHA1 Message Date
Jens Kubieziel
75bafa3589 Merge pull request 'Add closing span tags' (#6) from bobidle/webseite-krautspace:span into main 
Reviewed-on: http://kqfdxjpzqt345qplxy6yrgkj4rotfokskmxyqz5a4t4yewg6n62ea2ad.onion/Krautspace/webseite-krautspace/pulls/6
 2024-07-20 15:23:13 +02:00
Bob Idle
d945d70f74 Add closing span tags 2024-07-12 17:38:10 +02:00
Jens Kubieziel
b0cad50b88 Merge pull request 'close section tags' (#5) from bobidle/webseite-krautspace:section into main 
Reviewed-on: http://kqfdxjpzqt345qplxy6yrgkj4rotfokskmxyqz5a4t4yewg6n62ea2ad.onion/Krautspace/webseite-krautspace/pulls/5
Reviewed-by: Jens Kubieziel <qbi@noreply.git.kraut.space>
 2024-07-12 16:59:31 +02:00
Jens Kubieziel
3426d15a56 Merge pull request 'Remove question mark from http to https redirects' (#3) from bobidle/webseite-krautspace:http_redirect into main 
Reviewed-on: http://kqfdxjpzqt345qplxy6yrgkj4rotfokskmxyqz5a4t4yewg6n62ea2ad.onion/Krautspace/webseite-krautspace/pulls/3
Reviewed-by: Jens Kubieziel <qbi@noreply.git.kraut.space>
 2024-07-12 16:58:42 +02:00
Jens Kubieziel
e3d5307fb1 Merge pull request 'Remove invalid file from canonical link' (#2) from bobidle/webseite-krautspace:canonical into main 
Reviewed-on: http://kqfdxjpzqt345qplxy6yrgkj4rotfokskmxyqz5a4t4yewg6n62ea2ad.onion/Krautspace/webseite-krautspace/pulls/2
Reviewed-by: Jens Kubieziel <qbi@noreply.git.kraut.space>
 2024-07-12 16:57:39 +02:00
Jens Kubieziel
afe6e641c3 Merge pull request 'Use office@ as contact address' (#4) from bobidle/webseite-krautspace:office into main 
Reviewed-on: http://kqfdxjpzqt345qplxy6yrgkj4rotfokskmxyqz5a4t4yewg6n62ea2ad.onion/Krautspace/webseite-krautspace/pulls/4
Reviewed-by: Jens Kubieziel <qbi@noreply.git.kraut.space>
 2024-07-12 16:56:32 +02:00
Bob Idle
b45ca84776 close section tags 2024-07-09 13:48:16 +02:00
Bob Idle
03f3e33de5 Use office@ as contact address 2024-07-08 14:00:07 +02:00
Bob Idle
fd8bf45cee Remove question mark from http to https redirects 2024-07-07 12:11:41 +02:00
3 changed files with 10 additions and 10 deletions
Show stats Expand all files Collapse all files

2
etc/nginx/kraut.space.conf
View file

@ -11,7 +11,7 @@ server {
error_page 404 =301 https://wiki.kraut.space$request_uri; error_page 404 =301 https://wiki.kraut.space$request_uri;
location / { location / {
return 301 https://$host$request_uri?; return 301 https://$host$request_uri;
} }
location /chaostreff { location /chaostreff {

14
public/index.php
View file

@ -145,7 +145,7 @@
Jabber oder Matrix. Auf Wunsch richten wir dir auch gern einen Jabber oder Matrix. Auf Wunsch richten wir dir auch gern einen
Account ein. Account ein.
</p> </p>
<section> </section>
</div> </div>
<div id="treffpunkte" class="panel-wrapper content-overlay"> <div id="treffpunkte" class="panel-wrapper content-overlay">
@ -233,7 +233,7 @@
</aside> </aside>
</div> </div>
<section> </section>
</div> <!-- end class panel-wrapper content-overlay --> </div> <!-- end class panel-wrapper content-overlay -->
@ -355,7 +355,7 @@
<div class="sub-panel"> <div class="sub-panel">
<h4>Kontakt</h4> <h4>Kontakt</h4>
<ul> <ul>
<li><span class="no-wrap">Hackspace Jena e.&#x202f;V.</li> <li><span class="no-wrap">Hackspace Jena e.&#x202f;V.</span></li>
<li>Krautgasse 26</li> <li>Krautgasse 26</li>
<li>07743 Jena</li> <li>07743 Jena</li>
<li role="link">E-Mail: <a href="mailto:office@kraut.space" <li role="link">E-Mail: <a href="mailto:office@kraut.space"
@ -380,10 +380,10 @@
<div class="sub-panel"> <div class="sub-panel">
<h4>Bankverbindung</h4> <h4>Bankverbindung</h4>
<ul> <ul>
<li><span class="no-wrap">Inhaber: Hackspace Jena e.&#x202f;V.</li> <li><span class="no-wrap">Inhaber: Hackspace Jena e.&#x202f;V.</span></li>
<li><span class="no-wrap">IBAN: DE55 8309 4495 0003 1839 12</li> <li><span class="no-wrap">IBAN: DE55 8309 4495 0003 1839 12</span></li>
<li><span class="no-wrap">BIC: GENO DE F1 ETK</li> <li><span class="no-wrap">BIC: GENO DE F1 ETK</span></li>
<li><span class="no-wrap">Bank: Ethikbank Eisenberg</li> <li><span class="no-wrap">Bank: Ethikbank Eisenberg</span></li>
</ul> </ul>
</div> <!-- end class sub-panel --> </div> <!-- end class sub-panel -->

4
public/krautspace.ics
View file

@ -110,7 +110,7 @@ DTSTAMP;TZID=CET:20221211T100000
DTSTART;TZID=CET:20221211T190000 DTSTART;TZID=CET:20221211T190000
GEO:50.9292035\,11.5825763 GEO:50.9292035\,11.5825763
LOCATION:Online im Jitsi unter der URL https://meet.weimarnetz.de/freifunk-jena und vor Ort im Krautspace. LOCATION:Online im Jitsi unter der URL https://meet.weimarnetz.de/freifunk-jena und vor Ort im Krautspace.
ORGANIZER;CN="VORSTAND HACKSPACE JENA E.V.":MAILTO:basteln@kraut.space ORGANIZER;CN="VORSTAND HACKSPACE JENA E.V.":MAILTO:office@kraut.space
REFRESH-INTERVAL;VALUE=DURATION:P1W REFRESH-INTERVAL;VALUE=DURATION:P1W
RRULE:WKST=MO;FREQ=WEEKLY;BYDAY=TU RRULE:WKST=MO;FREQ=WEEKLY;BYDAY=TU
END:VEVENT END:VEVENT
@ -124,6 +124,6 @@ DTEND;TZID=CET:20230928T220000
DTSTAMP;TZID=CET:20230922T203000 DTSTAMP;TZID=CET:20230922T203000
GEO:50.9292035\,11.5825763 GEO:50.9292035\,11.5825763
LOCATION:BigBlueButton unter der URL https://kabi.blue/join/krautspace/ LOCATION:BigBlueButton unter der URL https://kabi.blue/join/krautspace/
ORGANIZER;CN="VORSTAND HACKSPACE JENA E.V.":MAILTO:basteln@kraut.space ORGANIZER;CN="VORSTAND HACKSPACE JENA E.V.":MAILTO:office@kraut.space
END:VEVENT END:VEVENT
END:VCALENDAR END:VCALENDAR