From 98f3eb884cc986bc9fbff595d320a6012eb65efa Mon Sep 17 00:00:00 2001 From: shel Date: Fri, 10 Feb 2017 11:37:35 -0500 Subject: [PATCH 1/4] Change List of Instances to Table Change list of known instances to a table with additional information per instance. Add awoo.space and gay.crime.team --- .../List-of-Mastodon-instances.md | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 2f15df083d..43ddd7f96e 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -1,12 +1,18 @@ -List of Mastodon instances +List of Known Mastodon instances ========================== -* [mastodon.social](https://mastodon.social) -* [social.tchncs.de](https://social.tchncs.de) -* [on.vu](https://on.vu) -* [animalliberation.social](https://animalliberation.social) -* [socially.constructed.space](https://socially.constructed.space) -* [epiktistes.com](https://epiktistes.com) -* [toot.zone](https://toot.zone) -Let me know if you start running one so I can add it to the list! +| Name | Theme/Notes, if applicable | Open Registrations | +| ------------- |:-------------:| -----:| +| [mastodon.social](https://mastodon.social) | Flagship, quick updates | $Yes | +| [awoo.space](https://awoo.space) | Intentionally moderated, only federates with mastodon.social | $Yes | +| [social.tchncs.de](https://social.tchncs.de) | Technology | $Yes | +| [animalliberation.social](https://animalliberation.social) | Animal Rights | $Yes | +| [socially.constructed.space](https://socially.constructed.space) | Single user | $No | +| [epiktistes.com](https://epiktistes.com) | N/A | $Yes | +| [toot.zone](https://toot.zone) | N/A | $Yes | +| [on.vu](https://on.vu) | Appears defunct | $No | +| [gay.crime.team](https://gay.crime.team) | N/A | $Yes(?) | + + +Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From c4036234a18962089b2537fa84a56ac5b5130704 Mon Sep 17 00:00:00 2001 From: shel Date: Fri, 10 Feb 2017 12:14:49 -0500 Subject: [PATCH 2/4] Clean up markdown There were some markdown processing errors which I've cleaned up --- .../List-of-Mastodon-instances.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index 43ddd7f96e..39e34b8a08 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -2,17 +2,17 @@ List of Known Mastodon instances ========================== -| Name | Theme/Notes, if applicable | Open Registrations | -| ------------- |:-------------:| -----:| -| [mastodon.social](https://mastodon.social) | Flagship, quick updates | $Yes | -| [awoo.space](https://awoo.space) | Intentionally moderated, only federates with mastodon.social | $Yes | -| [social.tchncs.de](https://social.tchncs.de) | Technology | $Yes | -| [animalliberation.social](https://animalliberation.social) | Animal Rights | $Yes | -| [socially.constructed.space](https://socially.constructed.space) | Single user | $No | -| [epiktistes.com](https://epiktistes.com) | N/A | $Yes | -| [toot.zone](https://toot.zone) | N/A | $Yes | -| [on.vu](https://on.vu) | Appears defunct | $No | -| [gay.crime.team](https://gay.crime.team) | N/A | $Yes(?) | +| Name | Theme/Notes, if applicable | Open Registrations | +| -------------|-------------|---| +| [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes| +| [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes| +| [social.tchncs.de](https://social.tchncs.de)|N/A|Yes| +| [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes| +| [socially.constructed.space](https://socially.constructed.space) |Single user|No| +| [epiktistes.com](https://epiktistes.com) |N/A|Yes| +| [toot.zone](https://toot.zone) |N/A|Yes| +| [on.vu](https://on.vu) | Appears defunct|No| +| [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 059d21c0fed1a3d35aee4e1172f12024ce6fa08f Mon Sep 17 00:00:00 2001 From: shel Date: Fri, 10 Feb 2017 13:06:38 -0500 Subject: [PATCH 3/4] Add link to other instances list This should help federation --- app/views/about/index.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index 88bfe3d610..022a3a9e48 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -32,6 +32,7 @@ = link_to t('about.learn_more'), about_more_path = link_to t('about.terms'), terms_path = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon' + = link_to t('about.other_instances'), 'https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md' = link_to t('about.get_started'), new_user_registration_path, class: 'button webapp-btn' = link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn' From 3f854bd75c50abb2d7f942e6fb7172433c63738d Mon Sep 17 00:00:00 2001 From: shel Date: Fri, 10 Feb 2017 13:08:47 -0500 Subject: [PATCH 4/4] Add link to other instances text Text for link to other instances --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index b1b1e7995d..018c923df2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,6 +10,7 @@ en: get_started: Get started learn_more: Learn more links: Links + other_instances: Other Instances source_code: Source code status_count_after: statuses status_count_before: Who authored