Commit graph

79 commits

Author SHA1 Message Date
shel
0470be7862 Correct innacurate info and other fixes
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
2017-04-05 10:58:41 -04:00
Eugen
5e3df4fb44 Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
7e32d74422 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy
9bd27e6882 Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
84930a6fd9 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
wxcafé
018b5e7d09 Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Cédric Levieux
223fdffd15 Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
3d27b6da3a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
9bd2fef50e Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
60b14ab09c Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Cédric Levieux
e4c0643059 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
5b33c53ab9 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
fa816b16c3 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Eugen
430e7019a4 Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
ca1adc114b Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Eugen
44be84f840 Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
Ian McDowell
7aeff85427 Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie
a123777873 Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
shel
679180e6f6 Corrected misinformation regarding Direct Posts
Unless something changed recently I have no clue why this said that direct posts do not federate because they do.
2017-04-04 21:47:13 -04:00
Ash Furrow
417b143dc5 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen
c87dcd8f45 Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen
7c6b77955c Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
f0304f24c6 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen
dc9a9e7366 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
d30df21d88 Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
e30f10a09b Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
2017-04-05 03:07:46 +02:00
Jason Snell
7e300a5e57 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Pierre Ozoux
b777d54db2 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz
cfb9551aca Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
942d5663a6 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Jo Decker
36cd3cc4dd Update social.diskseven.com's IPv6 status
As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before.
2017-04-04 15:29:07 +01:00
Adam Thurlow
e3327c69f1 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier
9d7588c29a Update List-of-Mastodon-instances.md
Add my own instance
2017-04-04 16:03:05 +02:00
Eugen
97d59985f9 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
08eecf0959 Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
Eugen
d73661496a Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
0cf9af385e Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Leo Wzukw
08c4451549 More consistent typography 2017-04-04 06:58:17 +02:00
Alice
243f910f40 Add octodon.social 2017-04-03 23:05:03 +02:00
Aesen
de75d8eb14 Add fern.surgeplay.com to the instances list
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.
2017-04-03 15:52:33 -04:00
Wonderfall
4d434a17ec update social.targaryen.house info 2017-04-03 21:36:28 +02:00
shel
348556e9bb Add instances from instances.mastodon.xyz
Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list
2017-04-03 12:28:36 -04:00
wxcafé
28794ac290 Adds social.wxcafe.net 2017-04-03 17:32:25 +02:00
shel
caf5b4df1a Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen
986c23eb83 Merge pull request #744 from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00
Michael Vieira
7b70f24da3 add link to another mastodon instance. 2017-04-03 00:04:54 +02:00
Florian Piesche
9611dc1bb0 Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 2017-04-02 22:31:43 +01:00
Florian Piesche
ebaba85e07 Add info on CW tags not automatically hiding images. 2017-04-02 22:07:23 +01:00
Florian Piesche
07613f1237 Update to catch up with new features and add missing images. 2017-04-02 22:03:00 +01:00
Florian Piesche
db322a525c Write up reporting. 2017-04-02 21:45:51 +01:00