From 84035e1b3671abb884e77068d37cca4da7634bc7 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Thu, 1 Dec 2022 00:51:30 +0300 Subject: [PATCH 01/23] Update Misc (htmlproofer) --- source/_data/miscellaneous.json | 56 ++++++++++++++++++- .../source/assets/scss/modules/_misc.scss | 1 + 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 11f1aa2..fc8e750 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -826,7 +826,7 @@ "apClass": true, "zotClass": false, "diasporaClass": false, - "OStatusClass": true, + "OStatusClass": false, "categories": ["SN-mi"] }, { @@ -1567,6 +1567,60 @@ "OStatusClass": false, "categories": ["SN-mi"] }, + { + "title": "apevents", + "source": "https://github.com/ngerakines/apevents", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Event management system that allows event creation and coordination across Fediverse.", + "codeLanguage": "Rust", + "techStack": "", + "license": "MIT", + "FediAccount": "@nick@thegem.city", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extention", "Ev-Meet"] + }, + { + "title": "AP-Groups", + "source": "https://github.com/michaelcpuckett/ap-groups", + "protocols": "ActivityPub", + "site": "https://chirp.social", + "logo": "", + "servers": "", + "description": "Group actors as bot / relay.", + "codeLanguage": "TypeScript", + "techStack": "", + "license": "MIT", + "FediAccount": "@mpuckett@a11y.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extention"] + }, + { + "title": "snac", + "source": "https://codeberg.org/grunfink/snac2", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Simple, minimalistic ActivityPub instance with minimal dependencies, multiuser, no database nor cookies needed, totally JavaScript-free.", + "codeLanguage": "C", + "techStack": "", + "license": "MIT", + "FediAccount": "comam.es/snac/grunfink", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, { "title": "diaspora*", "source": "https://github.com/diaspora/diaspora", diff --git a/themes/starter/source/assets/scss/modules/_misc.scss b/themes/starter/source/assets/scss/modules/_misc.scss index 1ec9a1a..d8870db 100644 --- a/themes/starter/source/assets/scss/modules/_misc.scss +++ b/themes/starter/source/assets/scss/modules/_misc.scss @@ -274,6 +274,7 @@ #crystal:checked ~ .misc__grid .card:not(.crystal), #ocaml:checked ~ .misc__grid .card:not(.ocaml), #java:checked ~ .misc__grid .card:not(.java), +#c:checked ~ .misc__grid .card:not(.c), #c\#:checked ~ .misc__grid .card:not(.c\#), #c:checked ~ .misc__grid .card:not(.c), #haskell:checked ~ .misc__grid .card:not(.haskell), From b87aceaffd7b7a8edbda22e53a4943a6a815264f Mon Sep 17 00:00:00 2001 From: Federico Leva Date: Wed, 30 Nov 2022 01:23:12 +0200 Subject: [PATCH 02/23] Add besocial.co.za --- source/en/portal/servers/index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 5382f8b..52059c0 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -157,6 +157,9 @@ Instances run by and for people belonging to some minority and moderated more st #### Portugal * [lisboa.social](https://lisboa.social) - Lisbon *(Mastodon)* +#### South Africa +* [besocial.co.za](https://besocial.co.za) - South Africa *(Mastodon)* + #### Spain * [barcelona.social](https://barcelona.social) - Barcelona *(Pleroma)* * [mstdn.es](https://mstdn.es) - Spain *(Mastodon)* From 6d658a7fae9f270d5fd3fa55c11e0063945a61f3 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Thu, 1 Dec 2022 01:11:30 +0300 Subject: [PATCH 03/23] Update servers --- source/en/portal/servers/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 52059c0..a367f06 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -178,6 +178,7 @@ Instances run by and for people belonging to some minority and moderated more st * [glasgow.social](https://glasgow.social) - Glasgow *(Mastodon)* * [bath.social](https://bath.social) - Bath *(Mastodon)* * [yorkshire.social](https://yorkshire.social) - Yorkshire *(Mastodon)* +* [gib.social](https://gib.social) - Gibraltar *(Mastodon)* #### USA * [masto.nyc](https://masto.nyc) - New York *(Mastodon)* From d9657696536fed4efba07b05e813a50175380780 Mon Sep 17 00:00:00 2001 From: Josef Sukdol Date: Thu, 1 Dec 2022 14:27:52 +0200 Subject: [PATCH 04/23] Add drumstodon.net --- source/en/portal/servers/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index a367f06..76b2eca 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -34,6 +34,7 @@ title: "Themed servers" * [feedbeat.me](https://feedbeat.me) - dedicated to culture and events such as music, poetry, comedy (German) *(Mastodon)* * [piano.masto.host](https://piano.masto.host) - dedicated to piano music, in English/Japanese *(Mastodon)* * [metalverse.social](metalverse.social) - from Metalheads for everybody *(Mastodon)* +* [drumstodon.net](https://drumstodon.net) - a place for drummers, musicians and music lovers in general ### 🔭 [Interests and hobbies](#hobbies) * [screenwriting.space](https://screenwriting.space) - a place for storytellers *(Mastodon)* From 6324001b5295ddbb11690b497f3918659514d45b Mon Sep 17 00:00:00 2001 From: Josef Sukdol Date: Thu, 1 Dec 2022 18:02:29 +0200 Subject: [PATCH 05/23] Fix wrong url & error 404 for metalverse.social --- source/en/portal/servers/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 76b2eca..ee3f6dd 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -33,7 +33,7 @@ title: "Themed servers" * [koreadon.com](https://koreadon.com) - for K-POP music fans *(Mastodon)* * [feedbeat.me](https://feedbeat.me) - dedicated to culture and events such as music, poetry, comedy (German) *(Mastodon)* * [piano.masto.host](https://piano.masto.host) - dedicated to piano music, in English/Japanese *(Mastodon)* -* [metalverse.social](metalverse.social) - from Metalheads for everybody *(Mastodon)* +* [metalverse.social](https://metalverse.social) - from Metalheads for everybody *(Mastodon)* * [drumstodon.net](https://drumstodon.net) - a place for drummers, musicians and music lovers in general ### 🔭 [Interests and hobbies](#hobbies) From cfb93f2a7adb8c98a8c804b41affa3da6b1eb8a7 Mon Sep 17 00:00:00 2001 From: Josef Sukdol Date: Thu, 1 Dec 2022 18:05:55 +0200 Subject: [PATCH 06/23] Added missing Mastodon def to drumstodon.net desc --- source/en/portal/servers/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index ee3f6dd..73d438b 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -34,7 +34,7 @@ title: "Themed servers" * [feedbeat.me](https://feedbeat.me) - dedicated to culture and events such as music, poetry, comedy (German) *(Mastodon)* * [piano.masto.host](https://piano.masto.host) - dedicated to piano music, in English/Japanese *(Mastodon)* * [metalverse.social](https://metalverse.social) - from Metalheads for everybody *(Mastodon)* -* [drumstodon.net](https://drumstodon.net) - a place for drummers, musicians and music lovers in general +* [drumstodon.net](https://drumstodon.net) - a place for drummers, musicians and music lovers in general *(Mastodon)* ### 🔭 [Interests and hobbies](#hobbies) * [screenwriting.space](https://screenwriting.space) - a place for storytellers *(Mastodon)* From 7bbfaed61d156a0d744d0c6d29e4b8e2e6118a61 Mon Sep 17 00:00:00 2001 From: Alexander Batischev Date: Thu, 1 Dec 2022 23:12:21 +0300 Subject: [PATCH 07/23] Fix htmlproofer CI job Dockerhub image got a major update, and we depended on the `latest` tag. I now pinned us to version 3, because I version 4 doesn't provide `--external-only`. Fixes #124. --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 75f3c71..fa4fbdf 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -15,7 +15,7 @@ pipeline: event: [push, deployment] htmlproofer: - image: olikami/htmlproofer:latest # fork of 18fgsa/html-proofer + image: olikami/htmlproofer:3 commands: - apk add git - ( git show --no-patch --format=format:%B | grep htmlproofer >/dev/null ) && htmlproofer public/ --external-only --checks-to-ignore ScriptCheck,ImageCheck || true From d576a9d8b309bd2c1b33d750140ae5a20314b8d4 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Thu, 1 Dec 2022 23:50:45 +0300 Subject: [PATCH 08/23] Update Navbar, About Us pages --- themes/starter/languages/en.yml | 4 +-- themes/starter/layout/_partial/navbar.ejs | 2 +- themes/starter/layout/about.ejs | 2 ++ .../source/assets/scss/modules/_navbar.scss | 33 ------------------- 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 9c18ebb..1e99204 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -4,13 +4,13 @@ # Menu menu: MENU -chronicles: Chronicles +chronicles: News knowledge: Knowledge more: All apps portal: Servers magic: Magic Ball logo: logo hub -about: about +about: about us # Index page hello: Hello, traveller! diff --git a/themes/starter/layout/_partial/navbar.ejs b/themes/starter/layout/_partial/navbar.ejs index ff08220..dc690f2 100644 --- a/themes/starter/layout/_partial/navbar.ejs +++ b/themes/starter/layout/_partial/navbar.ejs @@ -18,9 +18,9 @@