Commit Graph

296 Commits

Author SHA1 Message Date
wxcafé 29e6dc64e3 Merge pull request #24 from codl/patch-1
example nginx: remove includeSubDomains from hsts
2017-04-13 18:53:16 +02:00
wxcafé 429e7cfe52 Merge pull request #28 from ThomasChln/patch-1
Update API.md
2017-04-13 18:46:46 +02:00
Eugen 97ef33ff59 Merge pull request #27 from Wack0/patch-1
Fix broken links
2017-04-13 18:30:33 +02:00
ThomasChln a1b758dfd8 Update API.md 2017-04-13 16:18:43 +02:00
slipstream/RoL e3991fa4f8 Fix broken links
Fixed broken links due to documentation being in its own repo now.
2017-04-13 14:52:44 +01:00
codl 0005b49faf example nginx: remove includeSubDomains from hsts 2017-04-13 10:28:50 +02:00
Shel R 998a7d2901 Merge pull request #18 from bmaggi/patch-1
Links to Android playstore for TootyFruity and 11t
2017-04-12 12:40:31 -04:00
Shel R 35f696b95e Merge pull request #16 from expenses/master
Added ngrok link
2017-04-12 12:39:39 -04:00
Shel R 99ccd4d6e9 Merge pull request #9 from mjankowski/optimize-images
Optimize images used in screenshots
2017-04-12 12:33:31 -04:00
Shel R 4fae5d1434 Merge pull request #8 from nclm/patch-1
Working links to language files
2017-04-12 12:24:20 -04:00
Shel R bd5972626a Merge pull request #6 from Komic/master
Adding an Apache configuration example
2017-04-12 12:22:40 -04:00
Shel R 78342aa769 Remove commit to instance list
We are no longer maintaining this list. I don't want anyone to see an approved commit to the list and think they should submit PRs to add their instance.
2017-04-12 12:21:38 -04:00
Shel R 6c405b2171 Merge pull request #4 from ashfurrow/patch-1
Updated Heroku deploy guide.
2017-04-12 12:19:42 -04:00
Shel R 422ea2213a Merge pull request #3 from Angristan/patch-1
Adding description for mstdn.io
2017-04-12 12:18:37 -04:00
Benoit Maggi 339e3fbe7c Links to Android playstore for TootyFruity and 11t 2017-04-12 17:59:24 +02:00
Expenses d31186318a Added ngrok link 2017-04-12 20:18:53 +12:00
Eugen 306bb9c72e Merge pull request #10 from RileyKyeden/master
Add the sound a mastodon makes to the FAQ.
2017-04-12 01:18:31 +02:00
Eugen fa9bc60060 Merge pull request #11 from Vavassor/tootyfruity-github
TootyFruity info update, requested by kev (@eggplant@mastodon.social)
2017-04-12 01:17:51 +02:00
Vavassor 585a18e636 Tootyfruity info update, requested by kev (@eggplant@mastodon.social) 2017-04-11 17:53:06 -04:00
Riley Kyeden add13385ed Add the sound a mastodon makes to the FAQ. 2017-04-11 16:33:00 -04:00
Matt Jankowski 5664457424 Optimize images used in screenshots 2017-04-11 16:26:07 -04:00
nicolas b664a3b9c5 Working links 2017-04-11 22:04:18 +02:00
Komic d75e3d6087 Adding an Apache configuration example
(also added my instance)
2017-04-11 19:38:41 +02:00
Ash Furrow 7303db4934 Updated Heroku deploy guide. 2017-04-11 13:21:59 -04:00
Angristan f82648c96d Adding description for mstdn.io
Just forgot to add one.
2017-04-11 19:11:36 +02:00
Eugen Rochko eebeee2b76 Up-to-date dump from main repository 2017-04-11 17:48:27 +02:00
wxcafé 39103b3b46 Merge pull request #2 from mastodon-land/bug-api-http-method
Correct API accounts actions http method
2017-04-11 14:45:50 +02:00
Yann 581d62ea77 Correct API accounts actions http method 2017-04-10 22:03:47 +02:00
Shel R 3138d5b235 Merge pull request #1 from DavidLibeau/patch-1
Add mastodon.tools
2017-04-09 20:26:24 -04:00
David Libeau 18eec64546 Add mastodon.tools
A project about various tools including a Wordpress plugin, now ready to download at wordpress.org
2017-04-09 23:24:46 +02:00
Edward Vielmetti 356e9c0373 Add 2FA acronym for ease of search
Use the acronym to describe the protocol.
2017-04-09 15:43:18 +02:00
Edward Vielmetti e96055bb7e Note standards compliance, RFC 6238.
Time-Based One-Time Password Algorithm is the standard, so any 2FA program should work.

I'll test with Duo's 2FA token as well, and will update in a separate PR to add that app.
2017-04-09 15:43:18 +02:00
Edward Vielmetti 2385915a13 WebFinger is RFC 7033
Link to an RFC doc for it.
2017-04-09 15:29:01 +02:00
Ash Furrow acae9db314 Adds user confirmation rake task (#1300)
* Adds task to confirm user by email.

* Adds documentation for manual confirmation.
2017-04-09 01:09:46 +02:00
Elizabeth Myers 29f0425dcd Add mst3k.interlinked.me to list of instances (#1235) 2017-04-08 21:48:16 +10:00
kadiix fba0335ed8 Update mastodon.brussels instance name on List of Instances
Correct mastodon.brussels.fr to mastodon.brussels
2017-04-08 21:05:49 +10:00
Thibaut (Eychics) 55319d1352 Update mastodon.nuzgo.net (#1242)
Add ipv6 support
2017-04-08 20:34:53 +10:00
Eugen 0493dfb668 Revert "add persistance to Postresql container" (#1251) 2017-04-08 12:25:23 +02:00
Eugen 4cc3996be1 Merge pull request #1239 from ineffyble/patch-2
Fix my URL
2017-04-08 11:40:43 +02:00
Eugen 3d26364eb4 Merge pull request #1238 from milmazz/hunter-client
Add reference to Elixir client for Mastodon API
2017-04-08 11:40:20 +02:00
Eugen 360a07082a Merge pull request #887 from valentin2105/master
add persistance to Postresql container
2017-04-08 11:39:25 +02:00
Eugen 5c962c196f Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
2017-04-08 11:38:54 +02:00
Eugen a69523a25e Merge pull request #1198 from huertanix/patch-1
Update Heroku-guide.md
2017-04-08 11:38:33 +02:00
Milton Mazzarri 665f6ab707 Add reference to Elixir client for Mastodon API 2017-04-08 02:48:52 -05:00
Effy Elden f2291af752 Fix my URL
Update my URL since toot.zone was shut down.
2017-04-08 16:22:07 +10:00
Valentin Ouvrard 40bf6000b2 Merge branch 'master' into master 2017-04-08 15:11:20 +11:00
Shel R 0e273c5c23 Close instance list to additions 2017-04-07 23:51:30 -04:00
Shel R 127cb4457c Merge branch 'master' into patch-1 2017-04-07 23:15:17 -04:00
Shel R 0bc030e34d Merge branch 'master' into add_indigo_zone_instance 2017-04-07 23:09:50 -04:00
Shel R c014098111 Merge branch 'master' into list-oulipo-social 2017-04-07 23:08:41 -04:00