namekuji/activitypub-academy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #618 from yiskah/patch-3

Browse source 
Small Changes for Promotion of Other Instances
This commit is contained in:
Eugen 2017-02-10 19:15:21 +01:00 committed by GitHub
commit b7a92867de
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/about/index.html.haml
View file

@ -32,6 +32,7 @@
= link_to t('about.learn_more'), about_more_path = link_to t('about.learn_more'), about_more_path
= link_to t('about.terms'), terms_path = link_to t('about.terms'), terms_path
= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon' = 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('about.get_started'), new_user_registration_path, class: 'button webapp-btn'
= link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn' = link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn'

1
config/locales/en.yml
View file

@ -10,6 +10,7 @@ en:
get_started: Get started get_started: Get started
learn_more: Learn more learn_more: Learn more
links: Links links: Links
other_instances: Other Instances
source_code: Source code source_code: Source code
status_count_after: statuses status_count_after: statuses
status_count_before: Who authored status_count_before: Who authored

24
docs/Using-Mastodon/List-of-Mastodon-instances.md
View file

@ -1,13 +1,17 @@
List of Mastodon instances List of Known Mastodon instances
========================== ==========================
* [mastodon.social](https://mastodon.social) | Name | Theme/Notes, if applicable | Open Registrations |
* [social.tchncs.de](https://social.tchncs.de) | -------------|-------------|---|
* [on.vu](https://on.vu) | [mastodon.social](https://mastodon.social) |Flagship, quick updates|Yes|
* [animalliberation.social](https://animalliberation.social) | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|
* [socially.constructed.space](https://socially.constructed.space) | [social.tchncs.de](https://social.tchncs.de)|N/A|Yes|
* [epiktistes.com](https://epiktistes.com) | [animalliberation.social](https://animalliberation.social) |Animal Rights|Yes|
* [toot.zone](https://toot.zone) | [socially.constructed.space](https://socially.constructed.space) |Single user|No|
* [awoo.space](https://awoo.space/) | [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!
Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).