about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Merge pull request #992 from Eychics/masterShel R
Add mastodon.nuzgo.net in instance list
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Merge pull request #991 from vladooku/patch-1Shel R
Update List-of-Mastodon-instances.md
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #989 from MTNDevelopment/masterShel R
Updates instance list
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Merge pull request #986 from estuans/patch-2Shel R
Update List-of-Mastodon-instances.md
2017-04-07Merge branch 'master' into patch-2Shel R
2017-04-07Merge pull request #985 from Motoma/patch-1Shel R
Add Rich.GOP
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #982 from foxiehkins/masterShel R
Adding good-dragon.com instance to list
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Merge pull request #976 from shug0/patch-1Shel R
Adding masto.raildecake.fr, french instance 🌻🐘
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #975 from tomfhowe/patch-4Shel R
Use autohiding scrollbars in Microsoft Edge
2017-04-07Merge branch 'master' into patch-4Shel R
2017-04-07Merge pull request #973 from ZiiX/patch-1Shel R
added instance
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #972 from amandavisconti/masterShel R
Added digitalhumanities.club instance
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Merge pull request #970 from estuans/patch-1Shel R
Update Production-guide.md
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #969 from Fortyseven/patch-1Shel R
Add social.bytestemplar.com to instances list
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #959 from mkody/patch-1Shel R
Added im-in.space
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #953 from Technowix/patch-1Shel R
Add niu.moe, cuz it's kawaii
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #944 from VirtuBox/patch-1Shel R
Update List-of-Mastodon-instances.md
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-08Merge pull request #1204 from benklop/patch-1Eugen
Update Administration-guide.md
2017-04-08Merge pull request #1200 from huertanix/patch-2Eugen
Update Heroku-guide.md
2017-04-08Merge pull request #1210 from raymestalez/patch-3Eugen
Add HackerNewsBot
2017-04-07Add HackerNewsBotRay Alez
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
2017-04-07Update Administration-guide.mdbenklop
the syntax for running the rake task wasn't correct.
2017-04-08Merge pull request #1125 from jasonrhodes/patch-1Eugen
Email service options :P
2017-04-07Merge pull request #1147 from fmauNeko/docker_smaller_imageEugen
Fix npm/yarn cache cleaning
2017-04-07Update Heroku-guide.mdDavid Huerta
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
2017-04-07Merge pull request #1191 from d3vgru/masterEugen
change suggested cipher for nginx
2017-04-07Fix npm/yarn cache cleaningFlorian Maunier
2017-04-07Merge pull request #1172 from mjankowski/mj-heroku-docsEugen
Update heroku instructions
2017-04-07Merge pull request #1183 from thoughtbot/cp-post-status-service-specsEugen
Add specs for PostStatusService
2017-04-07Merge pull request #1184 from thoughtbot/extract-proper-statusEugen
DRY up reblog vs original status check
2017-04-07Merge pull request #1192 from seekr/patch-2Eugen
typo
2017-04-07Merge pull request #1193 from thoughtbot/status-specsEugen
Implement pending specs on Status
2017-04-07Implement pending specs on StatusJoël Quenneville
Implement the two pending specs on `Status`: `reblogs_count` and `favourites_count`.
2017-04-07typoseekr
2017-04-07change suggested cipher for nginxEd Knutson
2017-04-07Use I18n for media attachment validation errorsChad Pytel
These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.