162 commits

Author	SHA1	Message	Date
scriptjunkie	29efeecb9e	Add https://securitymastod.one/	2017-04-04 23:23:15 -05:00
shel	7d354cc8c5	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	128dcb2825	Adds mastodon.technology	2017-04-04 21:35:45 -04:00
Eugen	aa464aa0d8	Merge branch 'master' into patch-1	2017-04-05 03:20:37 +02:00
Eugen	78c1e2e958	Merge branch 'master' into patch-1	2017-04-05 03:19:14 +02:00
Eugen	bdaf31bcc9	Merge branch 'master' into patch-1	2017-04-05 03:18:42 +02:00
Eugen	f735efdbc1	Merge pull request #846 from TrollDecker/master ... Update social.diskseven.com's IPv6 status	2017-04-05 03:08:59 +02:00
Eugen	1c634ad21a	Merge pull request #845 from thurloat/patch-1 ... Add mastodon.club to running instances list	2017-04-05 03:07:59 +02:00
Eugen	682c8a6fc8	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	50a88d6a6e	Adding https://mastodon.cc	2017-04-04 16:35:57 -07:00
Pierre Ozoux	41ba74b511	Update the list of instances	2017-04-04 17:28:29 +01:00
Valentin Lorentz	22000ef7a9	Add oc.todon.fr to the list of instances. ... [SKIP CI]	2017-04-04 18:11:41 +02:00
Sébastien Santoro	7015578655	Add social.nasqueron.org instance	2017-04-04 18:11:14 +02:00
Jo Decker	d8855150a0	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	192f079776	Add mastodon.club to running instances list	2017-04-04 11:14:51 -03:00
Florian Maunier	58bdb9b42e	Update List-of-Mastodon-instances.md ... Add my own instance	2017-04-04 16:03:05 +02:00
Eugen	48dfdad492	Merge branch 'master' into patch-1	2017-04-04 14:51:42 +02:00
Eugen	ed4a723a82	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	c359e60034	Merge pull request #799 from Wonderfall/master ... update social.targaryen.house info	2017-04-04 14:50:35 +02:00
Eugen	7c075b5551	Merge pull request #788 from yiskah/patch-5 ... Add instances from instances.mastodon.xyz	2017-04-04 14:49:48 +02:00
Leo Wzukw	e81ba26be9	More consistent typography	2017-04-04 06:58:17 +02:00
Alice	5b6f4fdeb4	Add octodon.social	2017-04-03 23:05:03 +02:00
Aesen	1ed37fae9b	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	cc451e1fcb	update social.targaryen.house info	2017-04-03 21:36:28 +02:00
shel	8a45a97e2e	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é	d06c810b16	Adds social.wxcafe.net	2017-04-03 17:32:25 +02:00
shel	e2526a62e7	Add social.imirhil.fr	2017-04-02 20:11:28 -04:00
Eugen	d7d60073f9	Merge pull request #744 from fpiesche/master ... Add in-depth user guide	2017-04-03 00:26:24 +02:00
Michael Vieira	b69e97c40b	add link to another mastodon instance.	2017-04-03 00:04:54 +02:00
Florian Piesche	590558d52c	Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.	2017-04-02 22:31:43 +01:00
Florian Piesche	e92796b49c	Add info on CW tags not automatically hiding images.	2017-04-02 22:07:23 +01:00
Florian Piesche	60a82c9022	Update to catch up with new features and add missing images.	2017-04-02 22:03:00 +01:00
Florian Piesche	b277e88aae	Write up reporting.	2017-04-02 21:45:51 +01:00
Florian Piesche	03b2f37b46	Add information about the Direct privacy setting.	2017-04-02 21:39:05 +01:00
Florian Piesche	0f274589dd	Add information on following remote users or using the Search box to find them.	2017-04-02 21:33:39 +01:00
TheKinrar	9f219d8968	Add link to instances.mastodon.xyz	2017-04-02 17:48:25 +02:00
Sina Mashek	aaea7e1e7c	Adding social.mashek.net	2017-04-02 16:22:13 +03:00
Eugen	a2fa09518f	Merge branch 'master' into patch-1	2017-04-02 12:33:29 +02:00
TheKinrar	f5d434e433	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	1389d5d7fd	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	7ccc9b8b02	Add social.targaryen.house to instances list	2017-04-01 23:53:00 +02:00
TheKinrar	355168b939	Add mastodon.xyz to instances list	2017-04-01 18:00:52 +02:00
shel	5181702a60	Update amaroq name	2017-03-26 15:45:16 -04:00
shel	dd64baeba2	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	38dceb3bf7	Promote Apps (#670) ... "Various apps are available" is now a hyperlink	2017-03-17 16:16:39 +01:00
Eugen	c1124228e8	Update list of apps	2017-03-15 18:44:37 +01:00
Alexander Acevedo	851b730373	add social.gestaltzerfall.net instance information ... Hello fediverse!	2017-03-03 19:17:58 -05:00
undrskr	fac8bfc03f	gnusocial.me doesn't use Mastodon anymore ... The host uses postActiv now.	2017-03-03 22:38:10 +02:00
shel	b4a12c88e7	Add social.dickseven.com ... New instance	2017-02-28 13:02:39 -05:00
Florian Piesche	dad204a54d	Add user guide.	2017-02-17 16:14:10 +00:00
shel	7a99699e2d	Add memetastic.space ... It's uh, it's an instance now.	2017-02-13 14:37:58 -05:00
Lorenz Diener	73210a93df	Add https://icosahedron.website/	2017-02-13 17:25:21 +01:00
Effy Elden	0eee63f074	Remove toot.zone ... toot.zone is being discontinued	2017-02-12 14:51:53 +11:00
shel	894a0515d9	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	874fffb7dc	Merge branch 'master' into patch-3	2017-02-10 19:15:13 +01:00
shel	a0e6c80b60	Clean up markdown ... There were some markdown processing errors which I've cleaned up	2017-02-10 12:14:49 -05:00
shel	63a18efb27	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	e9fa557ead	Added awoo.space	2017-02-09 17:57:56 -05:00
James	7b7a356aed	fix extraneous text in 2fa readme (#592)	2017-02-03 00:10:22 +01:00
Eugen	9cf7da4934	Add tootyfruity	2017-02-02 20:27:53 +01:00
James	b12bdd2aea	Add 2-FA instructions for non-technical users (#580)	2017-01-29 19:26:27 +01:00
Eugen Rochko	e92a1cf436	Add wiki contents to docs/ instead	2017-01-21 22:51:02 +01:00