Commit Graph

190 Commits (451b7431c9d0a8bb34642d5af599bc48701376d2)

Author SHA1 Message Date
Shel R 451b7431c9 Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R 6efaee30b1 Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R 05be34a94b Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R e51b6bba94 Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R 4c05f0e630 Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R 7b7bff04df Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R 5dfc9854f1 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R 6d519e6fd1 Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R 065defefac Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Shel R bc237d17a7 Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Eugen a872f2f4c6 Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
Eugen 32a6f0884c Merge pull request #1200 from huertanix/patch-2
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
Ray Alez f113af5350 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 f578cf8331 Update Administration-guide.md
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
David Huerta a7ab2204d4 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
Eugen 0b32b5108e Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Eugen e2f024147c Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
seekr 131f505fd0 typo 2017-04-07 16:33:13 -03:00
Ed Knutson 27012aaeb6 change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Matt Jankowski 0f4fa59812 Update heroku instructions 2017-04-07 12:50:29 -04:00
foxiehkins 41396de7a9 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Eugen c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +02:00
VirtuBox c441208e29 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
Alex Gleason a3d204e982 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
Ben Field 8fa8004a2b Update List-of-Mastodon-instances.md 2017-04-05 18:20:08 +01:00
Christopher Gilbert e5566ac6a6 Add Rich.GOP 2017-04-05 13:05:27 -04:00
foxiehkins ac1989d2c0 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
foxiehkins 32d4b51939 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Thomas Alberola b38bd58921 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
ZiiX 96812a6c79 added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti a31f5765af Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00
Toby Deshane 9cf0b5b255 Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Jonathan Hurter b8218ca482 Make scalingo doc clearer 2017-04-05 17:48:55 +02:00
Kody 4de3182dc8 Added im-in.space 2017-04-05 17:00:03 +02:00
shel ee758551d1 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 b142a2ebf5 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Technowix 9a534d1df6 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
VirtuBox 28fb01c71a Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +02:00
Jonathan Hurter d6bab0c71c Add doc 2017-04-05 16:00:48 +02:00
Eugen a371a9e002 Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen be807ff7bd Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy cbcfd92a14 Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen b45b4865a7 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
Eugen 188172c401 Merge pull request #931 from farlistener/patch-3
Typography on partY
2017-04-05 14:57:14 +02:00
wxcafé 259e626165 Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Angristan 5ed2de6be2 Add git and curl as dependencies
In some VPS templates, they are not installed by default.
2017-04-05 14:11:08 +02:00
Cédric Levieux 85c768bf16 Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25 9572282a55 Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen f8a5ff95ec Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00