Commit Graph

131 Commits

Author SHA1 Message Date
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
Stefan 41be7924e4 Merge pull request 'master' (#4) from UsrSpace-Internal/website:master into master
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/4
2022-02-18 15:08:18 +01:00
Peter 1f4906d968 Merge pull request 'RepairCafe neuer Termin 12.03.2022' (#25) from master into deploy
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/25
2022-02-16 09:26:18 +01:00
Stefan 438a48b002 Merge pull request 'Termin nächstes Repair-Cafe korregiert' (#24) from pludi/website:repaircafe-termin into master
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/24
2022-02-16 09:23:30 +01:00
Peter f440973232
Termin nächstes Repair-Cafe korregiert 2022-02-16 09:19:16 +01:00
Peter 3a24624dbb
Termin nächstes Repair-Cafe korregiert 2022-02-16 08:49:09 +01:00
Peter 654cb32356 Merge pull request 'master' (#23) from master into deploy
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/23
2022-01-31 18:35:41 +01:00
Stefan 7f9eaabad7 Merge pull request 'master' (#3) from UsrSpace-Internal/website:master into master
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/3
2022-01-31 18:22:39 +01:00
Stefan 62212953f2 Merge branch 'master' into master 2022-01-31 18:21:32 +01:00
Stefan 7ee5e4ba32 Merge pull request 'repair-cafe-termin' (#21) from pludi/website:repair-cafe-termin into master
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/21
2022-01-31 18:10:23 +01:00
Stefan 8c64e7548c Merge pull request 'wiki-link-stammtisch-log-entfernen' (#22) from pludi/website:wiki-link-stammtisch-log-entfernen into master
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/22
2022-01-31 18:10:12 +01:00
Peter fa37071502
Merge branch 'master' into wiki-link-stammtisch-log-entfernen 2022-01-31 18:06:59 +01:00
Peter f507c77978 Merge branch 'deploy' into repair-cafe-termin 2022-01-31 18:06:06 +01:00
Peter fa577349eb
Merge branch 'master' into repair-cafe-termin 2022-01-31 18:05:32 +01:00
Peter 2dc3edf010 Merge branch 'master' of gitea.usrspace.at:UsrSpace-Internal/website 2022-01-31 18:05:08 +01:00
Peter 60b0b7018b
Termin des nächsten Repair Cafés aktualisiert 2022-01-31 15:02:50 +01:00
Peter fb2288003b
Link zum Wiki-Log der Stammtische entfernt 2022-01-31 15:00:10 +01:00
Stefan 684e38a26f Merge pull request 'master' (#1) from UsrSpace-Internal/website:master into master
Reviewed-on: https://gitea.usrspace.at/Skystalker/website/pulls/1
2021-11-05 13:47:42 +01:00
Peter 6c3a7c0550 Merge pull request 'deploy auf stand von master bringen' (#20) from master into deploy
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/20
2021-09-30 14:39:06 +02:00
Peter 5471cb86f6 Merge branch 'deploy' into master 2021-09-30 14:38:19 +02:00
Stefan e8c76164b8 Merge pull request 'Telegram Link hinzugefügt' (#18) from pludi/website:telegram into master
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/18
2021-09-30 14:23:01 +02:00
Peter 28335c973c Merge branch 'master' of gitea.usrspace.at:UsrSpace-Internal/website 2021-09-27 15:09:52 +02:00
Peter 5429ef9e23
icons entfernt 2021-09-24 07:17:59 +02:00
Peter 2302822a9f
icons entfernt 2021-09-24 07:15:56 +02:00
Peter 4d587d2eca Merge pull request 'Nächsten Repair Cafe Termin eingetragen' (#19) from Skystalker/website:master into master
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/19
2021-09-22 22:19:44 +02:00
Stefan ccd329e1c7 Nächsten Repair Cafe Termin eingetragen
Termin für den 6.11.2021
2021-09-21 23:06:43 +02:00
Peter cd571c55ea
Link zu Telegram-Gruppe hinzugefügt 2021-09-20 22:56:38 +02:00
Peter 182723df55
icons hinzugefügt 2021-09-13 09:42:07 +02:00
Peter 90fb4e9052 Add .gitignore 2021-09-13 09:40:22 +02:00