From e5f7aa1d94555434874404e9db2c0720632ed117 Mon Sep 17 00:00:00 2001 From: aRubes Date: Sun, 6 Aug 2023 20:27:54 +0300 Subject: [PATCH] before pull from upstream --- CONTRIBUTING.md | 3 ++- source/_data/miscellaneous.json | 17 +++++++++++++++++ source/en/portal/servers/index.md | 12 +++++++++--- source/img/misc/akkoma.svg | 6 +++++- source/img/misc/firefish.svg | 4 ++++ source/img/misc/skohub.svg | 4 ++++ source/img/misc/takahe.svg | 4 ++++ 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f143c47..4862fde 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,6 +18,7 @@ If your project targets mainly *developers*, tech-savvy users or is a helper (re Software submitted to **ALL APPS** website page **must be**: * Fully open source (please, consider showcasing your closed source apps on https://the-federation.info) * Supporting or planning to support one of the following protocols: OStatus, diaspora, Zot, ActivityPub (please, consider showcasing your apps federating via other protocols on https://the-federation.info) +* Being maintained (latest commit no older than 1.5 years ago) Fork this repository. Add your project data to `./source/_data/miscellaneous.json` file. @@ -42,7 +43,7 @@ Please, choose no more than **3 categories** (array of strings) for the software * `Forums` (forums and forum-like software, boards, etc) * `Other` (everything that doesn't quite fit into the above categories) -A project may have a logo / image (45x45px), placed in `./source/img/misc` folder. +A project may have a logo / image (PNG - 45x45px; SVG height and width - 24x24 if possible), placed in `./source/img/misc` folder. ### [Submitting tools](#submitting-tools) Fork this repository. Add your project data to `./source/_data/tools.json` file. diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 05fa67f..1979e16 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -335,7 +335,11 @@ "description": "An ActivityPub server with minimal dependencies, optimized for single-user application.", "codeLanguage": "Crystal", "techStack": "", +<<<<<<< HEAD "license": "GNU Affero General Public License", +======= + "license": "AGPL-3.0", +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 "FediAccount": "@toddsundsted@mastodon.social", "apClass": true, "zotClass": false, @@ -344,6 +348,7 @@ "categories": ["SN-mi"] }, { +<<<<<<< HEAD "title": "OLKi", "source": "https://framagit.org/synalp/olki/olki", "protocols": "ActivityPub", @@ -362,6 +367,8 @@ "categories": ["OpenData", "SN-mi"] }, { +======= +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 "title": "pubgate", "source": "https://github.com/autogestion/pubgate", "protocols": "ActivityPub", @@ -1371,9 +1378,15 @@ }, { "title": "Firefish", +<<<<<<< HEAD "source": "https://gitlab.prometheus.systems/firefish/firefish", "protocols": "ActivityPub", "site": "https://firefish.social/", +======= + "source": "https://git.joinfirefish.org/firefish/firefish", + "protocols": "ActivityPub", + "site": "https://joinfirefish.org", +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 "logo": "/img/misc/firefish.svg", "servers": "https://firefish.fediverse.observer/list", "description": "A fun, new, open way to experience social media. Foremerly known as Calckey, originally a Misskey fork", @@ -1427,7 +1440,11 @@ "title": "Takahe", "source": "https://github.com/andrewgodwin/takahe", "protocols": "ActivityPub", +<<<<<<< HEAD "site": "https://jointakahe.org/takahesocial/", +======= + "site": "https://jointakahe.org", +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 "logo": "/img/misc/takahe.svg", "servers": "", "description": "A very experimental Fediverse server for microblogging.", diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index dfa118a..75ee216 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -58,6 +58,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [bahn.social](https://bahn.social) - for rail enthusiasts, in German *(Mastodon)* * [toot.pizza](https://toot.pizza) - NYC-leaning urbanism and transit instance *(Mastodon)* * [towns.gay](https://towns.gay) - for radical queers, who believe that cities are for us too *(Mastodon)* +* [geobla.net](https://geobla.net) - for vanlife and camping *(Mastodon)* ### 🎏 [Language specific](#languages) * [toki.social](https://toki.social) - for those interested in toki pona *(Mastodon)* @@ -83,7 +84,8 @@ Information about adding a server can be found [here](https://codeberg.org/fediv ### πŸ›‘ [Safer spaces](#safer-spaces) -Instances run by and for people belonging to minorities and moderated more strictly than usual. A curated list of well-moderated, reliable instances is at [Fedi.Garden](https://fedi.garden). +Instances run by and for people belonging to minorities and moderated more strictly than usual +(also check out [Fedi.Garden](https://fedi.garden) for curated list of well-moderated instances) * [neovibe.app](https://neovibe.app) - for fans of music, movies, gaming and all forms of entertainment, LGBTQ+ friendly and Black-run *(Mastodon)* * [qdon.space](https://qdon.space) - a queer-friendly Korean-language instance - 퀴어 μΉœν™”μ μΈ λ§ˆμŠ€ν† λˆ μΈμŠ€ν„΄μŠ€μž…λ‹ˆλ‹€ *(Mastodon)* @@ -266,6 +268,10 @@ Instances run by and for people belonging to minorities and moderated more stric * [mastodon.acc.sunet.se](https://mastodon.acc.sunet.se) - by Academic Computer Club at UmeΓ₯ University, Sweden *(Mastodon)* * [akademienl.social](https://akademienl.social) - for anyone working in, affiliated with, or with a general interest in Dutch academia *(Mastodon)* * [social.sunet.se](https://social.sunet.se) - by the Swedish Research Council for anyone belonging to a Swedish university *(Mastodon)* +* [social.edu.nl](https://social.edu.nl) - by [SURF](https://www.wikidata.org/wiki/Q2422744), a cooperative of Dutch universities *(Mastodon)* +* [social.mpdl.mpg.de](https://social.mpdl.mpg.de) - by the [Max Planck Digital Library](https://www.mpdl.mpg.de/) at MPG *(Mastodon)* +* [wisskomm.social](https://wisskomm.social) - by [idw](https://de.wikipedia.org/wiki/Informationsdienst_Wissenschaft), for entities and groups in German academia *(Mastodon)* +* [social.up.edu.ph](https://social.up.edu.ph) - by the University of the Philippines *(Hometown)* ### πŸŽ‰ [Various (registration by application)](#registration-by-application) @@ -282,6 +288,7 @@ Instances run by and for people belonging to minorities and moderated more stric * [poweredbygay.social](https://poweredbygay.social) - for those LGBTQIA+ (and Allies) that are into fun adventurous things, like playing/watching sports, hiking, camping *(Mastodon)* * [retro.pizza](https://retro.pizza) - a queer-run poly-fandom nerd culture instance *(Mastodon)* * [connectop.us](https://connectop.us) - a respectful, diverse, inclusive community standing up for all marginalized gropus *(Mastodon)* +* [blackqueer.life](https://blackqueer.life) - for Black queer folks *(Mastodon glitch)* #### Furry (registration by application) *Instances which are focused on providing a safe space for furry interests and require approval for registration.* @@ -391,5 +398,4 @@ Instances run by and for people belonging to minorities and moderated more stric ## 🌟 Other research links - [Pirate Parties in Fediverse](https://codeberg.org/lostinlight/distributopia/src/branch/main/caramba) -- [Mastodon server distribution](https://chaos.social/@leah/99837391793032137) research by @Leah - +- [Mastodon server distribution](https://chaos.social/@leah/99837391793032137) - research by @Leah diff --git a/source/img/misc/akkoma.svg b/source/img/misc/akkoma.svg index 01ddbad..886ec90 100644 --- a/source/img/misc/akkoma.svg +++ b/source/img/misc/akkoma.svg @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -31,4 +32,7 @@ - \ No newline at end of file + +======= + +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 diff --git a/source/img/misc/firefish.svg b/source/img/misc/firefish.svg index 981fe2f..69d5837 100644 --- a/source/img/misc/firefish.svg +++ b/source/img/misc/firefish.svg @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -31,3 +32,6 @@ +======= + +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 diff --git a/source/img/misc/skohub.svg b/source/img/misc/skohub.svg index 8ca7375..2e20518 100644 --- a/source/img/misc/skohub.svg +++ b/source/img/misc/skohub.svg @@ -1,3 +1,4 @@ +<<<<<<< HEAD +======= + +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 diff --git a/source/img/misc/takahe.svg b/source/img/misc/takahe.svg index a2e6b36..c3728d4 100644 --- a/source/img/misc/takahe.svg +++ b/source/img/misc/takahe.svg @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -126,3 +127,6 @@ cx="94.10437" cy="131.92412" r="17.130112" /> +======= + +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30