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

58 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter daaf023b74
VCard hinzugefügt 2022-04-04 22:28:01 +02: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 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
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
Peter 55b5f05603 Merge pull request 'Relative Links und unnötige Leerzeichen am Zeilenende' (#15) from pludi/website:master into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/15
 2021-09-13 09:32:28 +02:00
Peter 37d10b6d75 Merge branch 'master' of gitea.usrspace.at:UsrSpace-Internal/website 2021-09-13 09:30:04 +02:00
Stefan e532a0c176 Merge pull request 'Favicon und noch ein Sync von Peter' (#16) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/16
 2021-09-10 16:23:45 +02:00
Stefan Dastig 3c54101cec Altes Favicon entfernt und neues SVG Icon im Root-Verzeichnis angelegt 2021-09-10 11:59:21 +02:00
Peter 81752e1e1e
Leerzeichen am Zeilenende entfernt 2021-09-08 16:42:25 +02:00
Peter 0efcf2209f Relative Links wo möglich 2021-09-08 16:36:04 +02:00
Peter b6f8c4d09b Merge pull request 'Master wieder auf Stand von Deploy' (#14) from deploy into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/14
 2021-09-08 15:01:23 +02:00
Stefan 86a12ea36c Style anpassung für Sidebar Logo und Webseiten Blau ebenfalls an Logo 2021-09-07 12:13:35 +02:00
Stefan dd57cb6beb Neues Logo als SVG in der Sidebar, Style über Inline und main.css 2021-09-07 12:08:16 +02:00
Peter 72cc7cde0a Merge pull request 'Manuelle Änderungen nachgezogen' (#13) from pludi/website:manuelle-aenderungen into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/13
 2021-09-07 11:39:47 +02:00
Peter 7a2624e26b Manuelle Änderungen nachgezogen 2021-09-07 11:38:49 +02:00
Peter 2067b8895c Merge pull request 'Manuelle Änderungen nachgezogen' (#12) from pludi/website:manuelle-aenderungen into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/12
 2021-09-07 11:33:37 +02:00
Peter 054b57ec23 Manuelle Änderungen nachgezogen 2021-09-07 11:32:54 +02:00
Peter aa91905544 Merge pull request 'master' (#11) from master into deploy 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/11
 2021-09-07 11:25:24 +02:00
Peter a063b60936 Merge pull request 'Neues Logo für SpaceAPI & Co' (#10) from pludi/website:master into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/10
 2021-09-07 10:54:10 +02:00
Peter 38f1565df0 Neues Logo für SpaceAPI & Co 2021-09-07 10:53:20 +02:00
Stefan f41f718c57 Merge pull request 'covid19-reopen' (#9) from pludi/website:covid19-reopen into master 
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/9

schaut gut aus, danke Peter
 2021-07-05 20:43:43 +02:00
Peter 145bab954e Stammtisch-Termine Hauptseite 2021-07-05 20:40:16 +02:00
Peter 2ea15f7f1d Stammtisch reloaded 2021-07-05 20:37:17 +02:00
Stefan 3e81679c98 Merge pull request 'Änderung der Zustelladresse' (#8) from pludi/website:addressaenderung into master 2020-11-11 16:31:51 +01:00
Peter 0e1879e96a
Merge upstream master 2020-11-11 16:13:58 +01:00
Stefan 54963f8dea Merge pull request 'Abgleich mit Live-Version 2020-11-11' (#7) from pludi/website:reality-check into master 2020-11-11 15:52:10 +01:00
Peter d132ad4de7
Änderung der Zustelladresse 2020-11-11 15:34:15 +01:00