Commit graph

188 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ben Field
7063dfd8e2 Update Production-guide.md
Corrected spelling error for "install"
2017-04-05 16:56:51 +01:00
Toby Deshane
f150c4923e Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Jonathan Hurter
c3f536126a Make scalingo doc clearer 2017-04-05 17:48:55 +02: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
Eugen
237ff5dd8f Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02: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
Jonathan Hurter
a9265eadda Add doc 2017-04-05 16:00:48 +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
Eugen
c9713e0cd0 Merge pull request #931 from farlistener/patch-3
Typography on partY
2017-04-05 14:57:14 +02:00
wxcafé
018b5e7d09 Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Angristan
5d21f25944 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
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
Eugen
b7a0a27e4f Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00