pludi/website
1
0
Fork 0
forked from UsrSpace-Internal/website
Code Issues Pull requests Releases Wiki Activity
109 commits 1 branch 0 tags 16 MiB
Commit graph

109 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter 6f59f36139
Neuen Mitgliedsantrag ausliefern 2023-09-20 16:56:03 +02:00
Stefan 8b23157268 Merge pull request 'ChatGPT sperren' (#54) from pludi/website:chatgpt into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/54
 2023-09-06 17:18:42 +02:00
Peter 28c22ad356
ChatGPT sperren 2023-09-03 11:49:38 +00:00
Peter 0052703f32 Merge pull request 'replaced twitter with mastodon' (#52) from Skystalker/website:mastodon_link into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/52
 2023-07-04 12:16:32 +02:00
Stefan Dastig 785b6c1085 changed Facebook link from site (doesn't exist anymore) to group 2023-07-04 12:10:39 +02:00
Stefan Dastig e8f3bcb05a replaced Twitter with Mastodon 2023-07-04 10:38:07 +02:00
Stefan 77ce889f7c Merge pull request 'master' (#11) from UsrSpace-Internal/website:master into master 
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/11
 2023-07-04 09:32:14 +02:00
Peter 22b377cad2 Neue Statuten (#50) 
Nachdem die Statuten von der BH bestätigt wurden können wir sie auf der Webseite freischalten.

Gleichzeitig wird die "Version" aus dem Link für die Statuten & Mitgliedsantrag raus genommen.

Co-authored-by: Peter Ludikovsky <peter@ludikovsky.name>
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/50
 2023-06-14 10:19:06 +02:00
Kurt 8ab7e1942d Merge pull request 'neuer-folder' (#48) from pludi/website:neuer-folder into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/48
 2023-06-09 16:41:31 +02:00
Peter b418d2a5f7
Merge branch 'master' into neuer-folder 2023-06-07 11:34:46 +02:00
Peter 46490e1d00 Merge pull request 'Termin für nächstes Repair Cafe angepasst' (#46) from pludi/website:repaircafe-september-2023 into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/46
 2023-06-05 22:47:56 +02:00
Peter 736ec7597d
Folder wieder verlinkt 2023-05-03 09:52:54 +02:00
Peter b96a8b75d5
Statuten, Mitgliedsantrag, und CoC jetzt ohne Datum verlinkt 2023-05-03 09:49:01 +02:00
Peter bdd7f22948
Termin für nächstes Repair Cafe angepasst 2023-05-01 20:19:58 +02:00
Kurt 9617511876 Merge pull request 'Nächster Repair Cafe Termin' (#44) from pludi/website:repaircafe-ktb-202304 into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/44
 2023-03-06 21:34:45 +01:00
Peter 453f321bbb Nächster Repair Cafe Termin 2023-03-06 20:36:26 +01:00
Stefan f05738ba74 Merge pull request 'master' (#10) from UsrSpace-Internal/website:master into master 
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/10
 2023-02-06 21:30:45 +01:00
Stefan cec0e9158c Merge pull request 'Donnerstags-Info entfernen' (#42) from pludi/website:stammtisch-mittwoch into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/42
 2023-02-06 21:27:16 +01:00
Peter cfd2cfe233 Donnerstags-Info entfernen 2023-02-06 21:23:19 +01:00
Stefan 8fa943de71 Merge pull request 'Info dass Stammtisch ab Jänner nur noch Mittwochs' (#40) from pludi/website:stammtisch-mittwoch into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/40
 2022-12-15 16:35:02 +01:00
Peter 026a4157ef Info dass Stammtisch ab Jänner nur noch Mittwochs 2022-12-15 16:24:40 +01:00
Peter fe1e823b31 Merge pull request 'Repair Cafe Termin geändert' (#38) from repair-cafe-04032023 into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/38
 2022-12-12 20:18:14 +01:00
Stefan 43826a0abe Repair Cafe Termin geändert 2022-12-12 20:12:57 +01:00
Peter 857c0272eb Merge pull request 'Nächstes Repair Café eingetragen' (#37) from pludi/website:master into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/37
 2022-11-09 06:38:49 +01:00
Peter ebab343ce5 Nächstes Repair Café eingetragen 2022-11-07 20:23:13 +01:00
Peter b08297036b Merge branch 'deploy' into master 2022-06-29 22:15:09 +02:00
Peter 01fec17a03
Merge branch 'master' into deploy 2022-06-29 10:15:57 +02:00
Stefan 464de8c403 Merge pull request 'wechsel auf Favicon mit transparentem Hintergrund' (#35) from Skystalker/website:master into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/35
 2022-06-29 09:55:28 +02:00
Stefan dbc5a816c2 Merge pull request 'wechsel auf Favicon mit transparentem Hintergrund' (#8) from neues_Favicon into master 
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/8
 2022-06-29 09:54:14 +02:00
Stefan Dastig bb2bc5f1af wechsel auf Favicon mit transparentem Hintergrund 2022-06-29 09:51:38 +02:00
Stefan b47e8b3573 Merge pull request 'Aktuellen Status veröffentlichen' (#34) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/34
 2022-05-16 14:48:44 +02:00
Peter a1ef2761c0 Merge pull request 'Neuer Schriftführer seit GV2022' (#33) from Skystalker/website:master into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/33
 2022-05-16 09:13:08 +02:00
Stefan 60bde50e27 Merge branch 'master' into master 2022-05-14 16:16:02 +02:00
Stefan c15cad19f4 „files/statuten.pdf“ löschen 2022-05-14 16:13:50 +02:00
Stefan ef2fb7e433 bereits von peter erstellt 2022-05-14 16:12:32 +02:00
Stefan f68d0de4c4 Merge pull request 'Neue Statuten seit GV 2022' (#31) from pludi/website:neue-statuten into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/31
 2022-05-14 16:10:02 +02:00
Stefan 1e49adbfae Neuer Schriftführer laut GV 2022 2022-05-14 16:06:54 +02:00
Stefan f332ffa320 Merge branch 'master' into master 2022-05-14 16:03:45 +02:00
Stefan f275cc051d neue Statuten siehe https://gitea.usrspace.at/public/infos/pulls/3 2022-05-14 16:02:16 +02:00
Peter 193b9f7940
Neue Statuten seit GV 2022 2022-05-14 11:08:53 +02:00
Peter 220427b0fe Merge pull request 'Änderungen veröffentlichen' (#30) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/30
 2022-04-05 12:59:15 +02:00
Peter 95be1c4c17 Merge branch 'deploy' into master 2022-04-05 12:58:55 +02:00
Peter 504d7d1cd2 Merge pull request 'nächster Repair Cafe Termin (24.09.2022)' (#29) from Skystalker/website:master into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/29
 2022-04-05 12:57:45 +02:00
Stefan b7c6cf525a nächster Repair Cafe Termin 2022-04-05 12:51:42 +02:00
Stefan 9e9d2703ae Merge pull request 'master' (#5) from UsrSpace-Internal/website:master into master 
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/5
 2022-04-05 12:49:36 +02:00
Stefan 974c67fd4a Merge pull request 'VCard hinzugefügt' (#28) from pludi/website:vcard into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/28
 2022-04-05 12:48:39 +02:00
Peter daaf023b74
VCard hinzugefügt 2022-04-04 22:28:01 +02:00
Peter 01a32c5100 Merge pull request 'master' (#27) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/27
 2022-03-24 18:16:02 +01:00
Stefan 9ada987946 Merge pull request 'Termin Repair-Café Kottingbrunn' (#26) from pludi/website:repair-cafe-kottingbrunn into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/26
 2022-03-24 18:03:58 +01:00
Peter 2d61a754ab
Termin Repair-Café Kottingbrunn 2022-03-23 19:43:02 +01:00