commit
10739df458
12
README.md
12
README.md
|
@ -25,11 +25,11 @@ If you would like, you can [support the development of this project on Patreon][
|
||||||
|
|
||||||
## Resources
|
## Resources
|
||||||
|
|
||||||
- [List of Mastodon instances](https://github.com/Gargron/mastodon/wiki/List-of-Mastodon-instances)
|
- [List of Mastodon instances](https://github.com/tootsuite/mastodon/wiki/List-of-Mastodon-instances)
|
||||||
- [Use this tool to find Twitter friends on Mastodon](https://mastodon-bridge.herokuapp.com)
|
- [Use this tool to find Twitter friends on Mastodon](https://mastodon-bridge.herokuapp.com)
|
||||||
- [API overview](https://github.com/Gargron/mastodon/wiki/API)
|
- [API overview](https://github.com/tootsuite/mastodon/wiki/API)
|
||||||
- [How to use the API via cURL/oAuth](https://github.com/Gargron/mastodon/wiki/Testing-with-cURL)
|
- [How to use the API via cURL/oAuth](https://github.com/tootsuite/mastodon/wiki/Testing-with-cURL)
|
||||||
- [Frequently Asked Questions](https://github.com/Gargron/mastodon/wiki/FAQ)
|
- [Frequently Asked Questions](https://github.com/tootsuite/mastodon/wiki/FAQ)
|
||||||
- [List of apps](https://github.com/tootsuite/mastodon/wiki/Apps)
|
- [List of apps](https://github.com/tootsuite/mastodon/wiki/Apps)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
@ -116,7 +116,7 @@ Which will re-create the updated containers, leaving databases and data as is. D
|
||||||
|
|
||||||
## Deployment without Docker
|
## Deployment without Docker
|
||||||
|
|
||||||
Docker is great for quickly trying out software, but it has its drawbacks too. If you prefer to run Mastodon without using Docker, refer to the [production guide](https://github.com/Gargron/mastodon/wiki/Production-guide) for examples, configuration and instructions.
|
Docker is great for quickly trying out software, but it has its drawbacks too. If you prefer to run Mastodon without using Docker, refer to the [production guide](https://github.com/tootsuite/mastodon/wiki/Production-guide) for examples, configuration and instructions.
|
||||||
|
|
||||||
## Development with Vagrant
|
## Development with Vagrant
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ This is optional, but will update your 'hosts' file when you start the virtual m
|
||||||
|
|
||||||
To create and provision a new virtual machine for Mastodon development:
|
To create and provision a new virtual machine for Mastodon development:
|
||||||
|
|
||||||
git clone git@github.com:Gargron/mastodon.git
|
git clone git@github.com:tootsuite/mastodon.git
|
||||||
cd mastodon
|
cd mastodon
|
||||||
vagrant up
|
vagrant up
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
.actions
|
.actions
|
||||||
.info
|
.info
|
||||||
= link_to t('about.terms'), terms_path
|
= link_to t('about.terms'), terms_path
|
||||||
= link_to t('about.source_code'), 'https://github.com/Gargron/mastodon'
|
= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
|
||||||
|
|
||||||
= 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'
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
.footer
|
.footer
|
||||||
%span.domain= link_to Rails.configuration.x.local_domain, root_path
|
%span.domain= link_to Rails.configuration.x.local_domain, root_path
|
||||||
%span.powered-by
|
%span.powered-by
|
||||||
= t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/Gargron/mastodon')).html_safe
|
= t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/tootsuite/mastodon')).html_safe
|
||||||
|
|
||||||
= render template: "layouts/application"
|
= render template: "layouts/application"
|
||||||
|
|
8
spec/fixtures/xml/mastodon.atom
vendored
8
spec/fixtures/xml/mastodon.atom
vendored
|
@ -107,14 +107,14 @@
|
||||||
<uri>https://mastodon.social/users/Gargron</uri>
|
<uri>https://mastodon.social/users/Gargron</uri>
|
||||||
<name>Gargron</name>
|
<name>Gargron</name>
|
||||||
<email>Gargron@mastodon.social</email>
|
<email>Gargron@mastodon.social</email>
|
||||||
<summary>Developer of Mastodon, a GNU social alternative: https://github.com/Gargron/mastodon</summary>
|
<summary>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</summary>
|
||||||
<link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron"/>
|
<link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron"/>
|
||||||
<link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/003/large/4375_eugencommish.png"/>
|
<link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/003/large/4375_eugencommish.png"/>
|
||||||
<link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/003/medium/4375_eugencommish.png"/>
|
<link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/003/medium/4375_eugencommish.png"/>
|
||||||
<link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/003/small/4375_eugencommish.png"/>
|
<link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/003/small/4375_eugencommish.png"/>
|
||||||
<poco:preferredUsername>Gargron</poco:preferredUsername>
|
<poco:preferredUsername>Gargron</poco:preferredUsername>
|
||||||
<poco:displayName>Eugen</poco:displayName>
|
<poco:displayName>Eugen</poco:displayName>
|
||||||
<poco:note>Developer of Mastodon, a GNU social alternative: https://github.com/Gargron/mastodon</poco:note>
|
<poco:note>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</poco:note>
|
||||||
</author>
|
</author>
|
||||||
</activity:object>
|
</activity:object>
|
||||||
</entry>
|
</entry>
|
||||||
|
@ -192,14 +192,14 @@
|
||||||
<uri>https://mastodon.social/users/Gargron</uri>
|
<uri>https://mastodon.social/users/Gargron</uri>
|
||||||
<name>Gargron</name>
|
<name>Gargron</name>
|
||||||
<email>Gargron@mastodon.social</email>
|
<email>Gargron@mastodon.social</email>
|
||||||
<summary>Developer of Mastodon, a GNU social alternative: https://github.com/Gargron/mastodon</summary>
|
<summary>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</summary>
|
||||||
<link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron"/>
|
<link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron"/>
|
||||||
<link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/003/large/4375_eugencommish.png"/>
|
<link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/003/large/4375_eugencommish.png"/>
|
||||||
<link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/003/medium/4375_eugencommish.png"/>
|
<link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/003/medium/4375_eugencommish.png"/>
|
||||||
<link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/003/small/4375_eugencommish.png"/>
|
<link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/003/small/4375_eugencommish.png"/>
|
||||||
<poco:preferredUsername>Gargron</poco:preferredUsername>
|
<poco:preferredUsername>Gargron</poco:preferredUsername>
|
||||||
<poco:displayName>Eugen</poco:displayName>
|
<poco:displayName>Eugen</poco:displayName>
|
||||||
<poco:note>Developer of Mastodon, a GNU social alternative: https://github.com/Gargron/mastodon</poco:note>
|
<poco:note>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</poco:note>
|
||||||
</activity:object>
|
</activity:object>
|
||||||
</entry>
|
</entry>
|
||||||
<entry>
|
<entry>
|
||||||
|
|
Reference in a new issue