Commit Graph

303 Commits

Author SHA1 Message Date
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
Shel R 34ce7c6fb9 Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R fd94a0bece Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R ba611ed3b2 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R f3ee549b28 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R 7c7851a45c Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R 791dcac706 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Shel R c388df681f Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Ray Alez c96ef27f44 Add HackerNewsBot
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
2017-04-07 15:56:02 -07:00
Blake bf19455cf6 Add indigo.zone to list of instances 2017-04-07 14:10:37 -07:00
Mouse Reeve 84b40fa940 Adds Oulipo.social to Mastodons list
This is a Mastodon with a particular constraint about
what symbols you can post.
2017-04-07 14:06:49 -07:00
Aguay-val 8d5e4d3d74 Add mastodon.fun 2017-04-07 20:33:52 +02:00
foxiehkins e21f876515 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jantso Porali 097db95bd3 Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Sergei Č 976e6797a1 Update List-of-Mastodon-instances.md 2017-04-07 11:54:41 +03:00
Tristan Mahé 0bde1b7f4e updated instance hostname 2017-04-06 17:18:40 -07:00
YDrogen dc2ef960f7 Added masto.razrnet.fr 2017-04-06 23:59:56 +02:00
Tristan Mahé 0718e1d3dc Added pericles.world in the list of instances 2017-04-06 12:05:37 -07:00
isati 7053ff9f6d Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher 075411f716 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix 64fff28022 Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00
kadiix 09d4ec4821 Add an instance. 2017-04-06 19:15:57 +02:00
VirtuBox 6aa0cf81bf Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
awea 3946a8fda6 Update List-of-Mastodon-instances.md 2017-04-06 18:07:15 +02:00
Julien e2965d2cb1 Add meow.social 2017-04-06 14:51:42 +02:00
Lukas Fülling 50d9f65682 add my instance 2017-04-06 14:22:01 +02:00
Ray Alez cca0f11f6d Added an instance to the list
Just launched https://hackertribe.io/, added it to the list.
2017-04-06 03:12:34 -07:00
Yann GUERN 53366cfcf3 Update List-of-Mastodon-instances.md
Add mastodon.land instance
2017-04-06 11:07:33 +02:00
Markus R d8db9d82c1 Update List-of-Mastodon-instances.md 2017-04-06 08:52:15 +02:00
Guewen FAIVRE 1cf59cbd8e Add mastodon.elao.com instance 2017-04-06 08:46:16 +02:00
Derek Lewis 217cf85c93 Add infinimatix.net to instance list 2017-04-06 01:15:16 -04:00
Jack Michaud 97a5772740 Add Northeastern University Mastodon 2017-04-05 20:58:21 -04:00
Nick Gerakines 88ae4714ff Added off-the-clock.us to the list of instances 2017-04-05 19:19:44 -04:00
Ninetailed 408c29a78b Description in instance list for mastodon.ninetailed.uk 2017-04-05 22:35:35 +01:00
Thibaut (Eychics) 8fcaf14e3c Add mastodon.nuzgo.net 2017-04-05 20:45:23 +02:00
ava 7fdf1f7381 Update List-of-Mastodon-instances.md 2017-04-05 21:44:13 +03:00
Brad Janke a5c7ec3bac Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Ben Field c05a3a3569 Update List-of-Mastodon-instances.md 2017-04-05 18:20:08 +01:00
Christopher Gilbert f5a90c886a Add Rich.GOP 2017-04-05 13:05:27 -04:00
foxiehkins 4e2c148ed6 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
foxiehkins 46c54a92b2 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Thomas Alberola 6aeaeb8b91 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
ZiiX 018e2fc68c added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti 4d226de556 Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00
Toby Deshane f150c4923e Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Kody 5c28bc676b Added im-in.space 2017-04-05 17:00:03 +02:00
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
Technowix 38c548fc27 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
VirtuBox ef2fa2f3a8 Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +02: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
Valentin_NC 0abb266705 add mastodon.cloud to List of instances 2017-04-05 20:36:21 +11: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
Florian Piesche 7faf421134 Add information about the Direct privacy setting. 2017-04-02 21:39:05 +01:00
Florian Piesche 1e94b65404 Add information on following remote users or using the Search box to find them. 2017-04-02 21:33:39 +01:00
TheKinrar f1989449cf Add link to instances.mastodon.xyz 2017-04-02 17:48:25 +02:00
Sina Mashek 29811a0407 Adding social.mashek.net 2017-04-02 16:22:13 +03:00
Eugen 05fe3c3942 Merge branch 'master' into patch-1 2017-04-02 12:33:29 +02:00
TheKinrar c9493c0ead Add IPv6 column in list and remove dead instance
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own.
2017-04-02 12:05:32 +02:00
jenn kaplan 81aa37cfbc Updated list of instances for gay.crime.team
Updated out-of-date info for gay.crime.team
2017-04-01 22:37:10 -07:00
Wonderfall 7ac5d132fc Add social.targaryen.house to instances list 2017-04-01 23:53:00 +02:00
TheKinrar 47b512a0af Add mastodon.xyz to instances list 2017-04-01 18:00:52 +02:00
shel 562a417d13 Update amaroq name 2017-03-26 15:45:16 -04:00
shel 312225b9fc Update Matador name to 11t
The project was renamed 11t, the link goes to a project titled "11t" this is just an update
2017-03-17 11:49:31 -04:00
shel a7b225e093 Promote Apps (#670)
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
Eugen b35944a5c4 Update list of apps 2017-03-15 18:44:37 +01:00
Alexander Acevedo 5ac99b4412 add social.gestaltzerfall.net instance information
Hello fediverse!
2017-03-03 19:17:58 -05:00
undrskr 22e12b4037 gnusocial.me doesn't use Mastodon anymore
The host uses postActiv now.
2017-03-03 22:38:10 +02:00
shel d7f35050ad Add social.dickseven.com
New instance
2017-02-28 13:02:39 -05:00
Florian Piesche 1ceb6b7146 Add user guide. 2017-02-17 16:14:10 +00:00
shel 0abc528eb9 Add memetastic.space
It's uh, it's an instance now.
2017-02-13 14:37:58 -05:00
Lorenz Diener fc17b06edc Add https://icosahedron.website/ 2017-02-13 17:25:21 +01:00
Effy Elden d2fc1acb38 Remove toot.zone
toot.zone is being discontinued
2017-02-12 14:51:53 +11:00
shel 728acea127 Add gnusocial.me to instance list
I'm never going to get tired of saying "gnusocial.me is a mastodon instance"
2017-02-10 15:07:44 -05:00
Eugen 19e8393246 Merge branch 'master' into patch-3 2017-02-10 19:15:13 +01:00
shel 500250952b Clean up markdown
There were some markdown processing errors which I've cleaned up
2017-02-10 12:14:49 -05:00
shel 0c312cfd56 Change List of Instances to Table
Change list of known instances to a table with additional information per instance. Add awoo.space and gay.crime.team
2017-02-10 11:37:35 -05:00
Neville Park dc7639c0f2 Added awoo.space 2017-02-09 17:57:56 -05:00
James 476952fed0 fix extraneous text in 2fa readme (#592) 2017-02-03 00:10:22 +01:00
Eugen 2852dbae5c Add tootyfruity 2017-02-02 20:27:53 +01:00
James a4b55cc670 Add 2-FA instructions for non-technical users (#580) 2017-01-29 19:26:27 +01:00
Eugen Rochko 2eb6ed093f Add wiki contents to docs/ instead 2017-01-21 22:51:02 +01:00