pludi
/
website
forked from UsrSpace-Internal/website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
131 Commits 1 Branch 0 Tags 16 MiB
Commit Graph

131 Commits

Author SHA1 Message Date
Kurt f00009000f Merge pull request 'Nächster Repair Café-Termin' (#64) from pludi/website:naechstes-repaircafe into master 
Reviewed-on: UsrSpace-Internal/website#64
 2023-10-09 13:42:54 +02:00
Peter 5e5d616b63
Nächster Repair Café-Termin 2023-10-09 13:40:21 +02:00
Stefan bbb09869b1 Merge pull request '.well-known in Git importiert' (#59) from pludi/website:well-known into master 
Reviewed-on: UsrSpace-Internal/website#59
 2023-10-03 09:45:41 +02:00
Stefan f32c79dccd Merge pull request 'Neuer Mitgliedsantrag' (#62) from pludi/website:neuer-mitgliedsantrag into master 
Reviewed-on: UsrSpace-Internal/website#62
 2023-10-03 09:34:51 +02:00
Peter a85ba3b960 Merge branch 'master' into neuer-mitgliedsantrag 2023-10-02 21:38:08 +02:00
Peter 0e6fe01c44
Mitgliedsantrag_v5_final 2023-10-02 21:37:38 +02:00
Peter 996a9cbbff Merge branch 'deploy' into master 2023-09-21 13:59:15 +02:00
Stefan 9c4041da75 Merge pull request 'OpenPGP key & security.txt hinzugefügt' (#58) from pludi/website:security.txt into master 
Reviewed-on: UsrSpace-Internal/website#58
 2023-09-21 13:50:04 +02:00
Stefan ca1b4b4c20 Merge pull request 'gitea -> git' (#56) from pludi/website:gitea-to-forgejo into master 
Reviewed-on: UsrSpace-Internal/website#56
 2023-09-21 13:44:28 +02:00
Peter 6f59f36139
Neuen Mitgliedsantrag ausliefern 2023-09-20 16:56:03 +02:00
Peter 5ac2e7a9c2 .well-known in Git importiert 2023-09-20 14:30:38 +02:00
Peter 8a1b026993
.well-known in Git importiert 2023-09-20 14:28:50 +02:00
Peter 4dd52b5f93
OpenPGP key & security.txt hinzugefügt 2023-09-20 14:00:01 +02:00
Peter 3fa5b9da17
gitea -> git 2023-09-13 21:36:58 +02:00
Peter 89b984de12 Merge pull request 'ChatGPT sperren' (#55) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/55
 2023-09-06 17:52:58 +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
Stefan dd46cfc315 Merge pull request 'Deploy der letzten Änderungen' (#53) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/53
 2023-07-04 12:19:29 +02: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
Stefan 2b30833e4d Merge pull request 'Statuten, Repair Café, …' (#51) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/51
 2023-07-04 09:30:47 +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 cc45f6597a Merge pull request 'Neuer Termin Repair Cafe' (#49) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/49
 2023-06-05 23:08:14 +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
Peter 970714506b Merge pull request 'master' (#45) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/45
 2023-03-09 11:04:04 +01: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
Peter cd536f8ed0 Merge pull request 'master' (#43) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/43
 2023-02-06 21:29:17 +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
Peter f5b23faa77 Merge pull request 'Info dass Stammtisch ab Jänner nur noch Mittwochs' (#41) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/41
 2022-12-15 16:40:25 +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
Stefan 5a01271ff9 Merge pull request 'Termin Repair-Café veröffentlichen' (#39) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/39
 2022-12-12 20:29:53 +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 371496ceca Merge pull request 'wechsel auf Favicon mit transparentem Hintergrund' (#36) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/36
 2022-11-09 06:40:43 +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