diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json index b380cca..36157d3 100644 --- a/source/_data/gnusocial.json +++ b/source/_data/gnusocial.json @@ -16,9 +16,8 @@ "wiki": "", "servers": [ - {"num": "1", "url": "https://fediverse.joinout.de"}, - {"num": "2", "url": "https://fediverse.network/gnusocial"}, - {"num": "3", "url": "https://the-federation.info/gnusocial"} + {"num": "1", "url": "https://fediverse.network/gnusocial"}, + {"num": "2", "url": "https://the-federation.info/gnusocial"} ], "mobile": "https://gitlab.com/distributopia/gnusocial-clients", "tutorials": diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index b505d57..1668a01 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -33,9 +33,8 @@ ], "tutorials": [ - {"id": "0", "url": "https://medium.com/@GinnyMcQueen/toot-how-to-intro-to-mastodon-e5655bfa87d2"}, - {"id": "1", "url": "https://alexschroeder.ch/wiki/2017-11-16_How_to_Mastodon"}, - {"id": "2", "url": "https://gist.github.com/joyeusenoelle/74f6e6c0f349651349a0df9ae4582969"} + {"id": "0", "url": "https://alexschroeder.ch/wiki/2017-11-16_How_to_Mastodon"}, + {"id": "1", "url": "https://gist.github.com/joyeusenoelle/74f6e6c0f349651349a0df9ae4582969"} ], "devTutorial": "https://github.com/tootsuite/documentation", "metrics": diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index f26293f..ed706da 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -16,6 +16,7 @@ Servers are not restricted to their theme. They only help people with common int #### 🎨 [Humanities](#humanities) * [mastodon.art](https://mastodon.art) - for artists +* [raconteur.ink](https://raconteur.ink) - creative instance for all creative disciplines * [writing.exchange](https://writing.exchange) - community for poets, writers, bloggers * [bookwor.ms](https://bookwor.ms) - for book-lovers * [wandering.shop](https://wandering.shop) - science fiction and fantasy community @@ -36,9 +37,6 @@ Servers are not restricted to their theme. They only help people with common int * [tusk.schoollibraries.net](https://tusk.schoollibraries.net) - helping educators improve the School Libraries Resource Network * [openbiblio.social](https://openbiblio.social) - German libraries and information facilities -#### πŸ’Ό [Law](#law) -* [legal.social](https://legal.social) - instance for legal debate - #### πŸ™ [Religion](#religion) * [rcsocial.net](https://rcsocial.net) - for Catholics and those interested in Catholicism * [monastery.social](https://monastery.social) - progressive, intentional, and contemplative Christian community @@ -51,12 +49,13 @@ Servers are not restricted to their theme. They only help people with common int #### πŸ”­ [Hobbies](#hobbies) * [cruisers.social](https://cruisers.social) - for sailors, cruisers, boat owners, and anyone exploring the world's coastlines * [makestuff.club](https://makestuff.club) - for people that make stuff -* [scramble.city](https://scramble.city) - Transformers, super robots, mecha and related subjects +* [scramble.city](https://scramble.city) - transformers, super robots, mecha and related subjects * [mhz.social](https://mhz.social) - for radio amateurs, DXers and anyone interested to geek out about radio * [afu.social](https://afu.social) - for radio amateurs in German-speaking (and other) countries * [mastodon.radio](https://mastodon.radio) - for Amateur (Ham) Radio community * [dice.camp](https://dice.camp) - for tabletop gamers * [mastodon.beerfactory.org](https://mastodon.beerfactory.org) - for beermakers +* [gymnastodon.com](https://gymnastodon.com) - for gymnastics fans * [motogp.space](https://motogp.space) - for MotoGP and motorbikes fans * [mastd.racing](https://mastd.racing) - dedicated to motosports * [cartodon.com](https://cartodon.com) - to discuss anything related to cars, racing, and car care @@ -64,12 +63,12 @@ Servers are not restricted to their theme. They only help people with common int * [occult.camp](https://occult.camp) - focused on spitituality, witchcraft and various shades of woo * [witchcraft.cafe](https://witchcraft.cafe) - for witches * [witches.live](https://witches.live) - for witches -* [travel-friends.chat](https://travel-friends.chat) - for people who like to travel * [worldtravel.photos](https://worldtravel.photos) - social space for travel * [mmorpg.social](https://mmorpg.social) - for those who love MMOs * [walkers.social](https://walkers.social) - for those who like walking, trekking, hiking, camping, climbing, and other outdoor adventuring * [kith.kitchen](https://kith.kitchen) - centered around food, cooking * [about-bitcoin.com](https://about-bitcoin.com) - anything related to bitcoin and other crypto-currencies +* [animeworld.io](https://animeworld.io) - for fans of anime and Otaku culture #### 🎏 [Language specific](#languages) * [polyglot.city](https://polyglot.city) - for polyglots, multilinguals, interested in languages and translating @@ -106,6 +105,7 @@ Servers are not restricted to their theme. They only help people with common int * [rva.party](https://rva.party) - Richmond, USA * [txsocial.club](https://txsocial.club) - Texas, USA * [southflorida.social](https://southflorida.social) - South Florida, USA +* [kcmo.social](https://kcmo.social) - Kansas City area, USA * [polska.masto.host](https://polska.masto.host) - Poland * [mastodon.mg](https://mastodon.mg) - Madagascar * [balkan.fedive.rs](https://balkan.fedive.rs) - the Balkans (generalistic) @@ -117,6 +117,7 @@ Servers are not restricted to their theme. They only help people with common int * [kopiti.am](https://kopiti.am) - Singapore * [mexicosocial.mx](https://mexicosocial.mx) - Mexico * [mastodon.opencloud.lu](https://mastodon.opencloud.lu) - Luxembourgish / European private and public organisations +* [mastodon.uno](https://mastodon.uno]) - Italy #### 🎬 [Game / Book / Show theme](#entertainment) * [tenforward.social](https://tenforward.social) - theme Star Trek @@ -126,7 +127,6 @@ Servers are not restricted to their theme. They only help people with common int #### 🐚 [Run by tech-savvy organizations](#run-by-tech-savvy-organizations) * [en.osm.town](https://en.osm.town) - for the OpenStreetMap Community -* [fr.osm.social](https://fr.osm.social) - for francophone OpenStreetMap Community * [chaos.social](https://chaos.social) - CCC related * [framapiaf.org](https://framapiaf.org) - by [Framasoft](https://framasoft.org) * [mastodon.dotopia.dk](https://mastodon.dotopia.dk) - by DO:TOPIA, Denmark based tech activism collective @@ -153,6 +153,7 @@ Servers are not restricted to their theme. They only help people with common int * [mathstodon.xyz](https://mathstodon.xyz) - for Maths people * [digipres.club](https://digipres.club) - conversations about digital preservation * [social.privacytools.io](https://social.privacytools.io) - focused on tech and privacy related topics +* [calculate.social](https://calculate.social) - Calculate Linux users community #### πŸ’» [Programming](#instances-for-programmers) * [ruby.social](https://ruby.social) - for people interested in Ruby, Rails and related topics @@ -183,7 +184,6 @@ Servers are not restricted to their theme. They only help people with common int * [donteatanimals.org](https://donteatanimals.org) - discussion of animal rights and veganism * [toot.cat](https://toot.cat) - instance for cats, the people who love them, and kindness in general * [waterfowl.social](https://waterfowl.social) - for waterfowl lovers who keep ducks, geese, and other waterfowl as pets -* [ecosteader.com](https://ecosteader.com) - for builders, designers, and innovators of green / eco-friendly habitats #### 🌈 [Safe spaces](#safe-spaces) * [queer.party](https://queer.party) - for queer folk and non-queer folk alike @@ -231,6 +231,7 @@ Servers are not restricted to their theme. They only help people with common int * [mastodon.acc.sunet.se](https://mastodon.acc.sunet.se) - by Academic Computer Club at UmeΓ₯ University, Sweden * [mastodon.iut-larochelle.fr](https://mastodon.iut-larochelle.fr) - by University of La Rochelle * [mastodon.iut-larochelle.fr](https://mastodon.redbrick.dcu.ie) - by Redbrick, Dublin City University +* [mastodon.utwente.nl](https://mastodon.utwente.nl) - for the University of Twente community * [w3c.social](https://w3c.social) - for people involved in the activities of the World Wide Web Consortium (W3C) * [mastodon.greenpeace.ch](https://mastodon.greenpeace.ch) - by Greenpeace Switzerland * [fourthestate.social](https://fourthestate.social) - international membership organization working to democratize news and journalism for the public benefit diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index ee26723..2a0c4df 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -96,7 +96,6 @@ proxy: proxy relay: relay # mastodon page -intro: Intro to Mastodon howto: How to Mastodon guide: Guide awesome: Awesome Mastodon list diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index 3e556a4..b388306 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -6,7 +6,7 @@ network: true <% const data = site.data.mastodon.data; - const tuts = [__('intro'), __('howto'), __('guide')]; + const tuts = [__('howto'), __('guide')]; const uxList = [__('uMatch'), __('mastoGallery'), __('trunk')]; const stats = [__('stats')]; const tools = [__('preinstalled')];