Commit Graph

177 Commits

Author SHA1 Message Date
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 99ccd4d6e9 Merge pull request #9 from mjankowski/optimize-images
Optimize images used in screenshots
2017-04-12 12:33:31 -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
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
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
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
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
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 360a07082a Merge pull request #887 from valentin2105/master
add persistance to Postresql container
2017-04-08 11:39:25 +02: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
Shel R d5998431b1 Merge branch 'master' into patch-2 2017-04-07 23:05:08 -04:00
Shel R c6a30c2272 Merge branch 'master' into patch-1 2017-04-07 23:03:07 -04:00
Shel R 5e52f81d0b Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R 960bf1823f Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R b7d1d57035 Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
Shel R 6f121ae603 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R 1cbf83dfd3 Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R da91b207e9 Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R 9ef164a3e2 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R 2caa1fa679 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R 79875f5505 Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R 6c766318ac Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Valentin Ouvrard e08dfa6f32 Merge branch 'master' into master 2017-04-08 13:39:31 +11:00
Valentin Ouvrard 8fb9960e92 Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R 4062abe596 Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R aa6f267117 Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R 1b964ab4c2 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R 95440a1ac3 Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R aa7ba961c8 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R 8a46f49140 Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R aeb5f657d1 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R 9cdf42ba65 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R d42ddf0dad Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R cc3037296a Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R 05bb90718d Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R 8374ca6182 Merge branch 'master' into master 2017-04-07 22:08:54 -04:00