Commit Graph

566 Commits

Author SHA1 Message Date
Shel R 9470afa4f3 Merge branch 'master' into patch-1 2017-04-07 21:49:18 -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
David Huerta e8e607a356 Merge branch 'master' into patch-1 2017-04-07 19:46:07 -04:00
Eugen 266cf6c3c2 Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
Eugen ecce87e858 Merge pull request #1200 from huertanix/patch-2
Update Heroku-guide.md
2017-04-08 01:00:06 +02: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
benklop be8680df9a Update Administration-guide.md
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
David Huerta 774b752498 Update Heroku-guide.md
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
2017-04-07 17:44:32 -04:00
David Huerta 9efa356f9c Update Heroku-guide.md
Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.
2017-04-07 17:29:21 -04: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
Eugen b44df8f36c Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Eugen b1501669f9 Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
seekr 7123e2cb5a typo 2017-04-07 16:33:13 -03:00
Ed Knutson b130db887e change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Aguay-val 8d5e4d3d74 Add mastodon.fun 2017-04-07 20:33:52 +02:00
Matt Jankowski f26e10dd99 Update heroku instructions 2017-04-07 12:50:29 -04: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
Vladimir Mincev 272d25c383 Update Production-guide.md
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02: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 de555fdc55 Merge branch 'master' into patch-1 2017-04-06 19:32:31 +02:00
Eugen d09a7460b3 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +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
Alex Gleason 77924befb2 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04: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