about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-05Merge pull request #818 from JantsoP/masterEugen
Updated Finnish Translation
2017-04-05Merge pull request #846 from TrollDecker/masterEugen
Update social.diskseven.com's IPv6 status
2017-04-05Merge pull request #842 from Angristan/patch-2Eugen
Missing quotes
2017-04-05Merge pull request #845 from thurloat/patch-1Eugen
Add mastodon.club to running instances list
2017-04-05Merge pull request #848 from ProgVal/patch-3Eugen
Add oc.todon.fr to the list of instances.
2017-04-05Merge pull request #854 from Angristan/patch-3Eugen
Fix crontab edit
2017-04-05Merge pull request #866 from kklleemm/patch-1Eugen
Fix typos on french translations
2017-04-05Merge pull request #792 from chapeaumeinfreund/masterEugen
Updated and fixed german orthography
2017-04-05Merge pull request #790 from chapeaumeinfreund/patch-1Eugen
Updated and fixed german orthography
2017-04-05Merge pull request #852 from peterkeen/email-whitelist-817Eugen
[#817] Add email whitelist
2017-04-05Merge pull request #891 from ashfurrow/patch-1Eugen
Adds instructions for adding admin users for Heroku installs
2017-04-05Merge pull request #805 from nevillepark/masterEugen
Changed "reblogs" to "boosts"
2017-04-05Merge pull request #894 from asm/mastodon_ccEugen
Adding https://mastodon.cc
2017-04-05Merge pull request #898 from SirCmpwn/remote-follow-improvementsEugen
Remote follow improvements
2017-04-05Merge pull request #858 from krainboltgreene/patch-6Eugen
Use active record shorthand
2017-04-04Updates instructions.Ash Furrow
2017-04-05Merge pull request #872 from kwaio/patch-1Eugen
typo in admin doc
2017-04-04Remote follow improvementsDrew DeVault
This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.
2017-04-05Merge pull request #868 from Angristan/patch-4Eugen
Add file package
2017-04-05Remove PuSH subscriptions when delivery is answered with a 4xx errorEugen Rochko
2017-04-04Adding https://mastodon.ccJason Snell
2017-04-04Adds instructions for adding admin users.Ash Furrow
2017-04-04Merge pull request #876 from krainboltgreene/patch-7Eugen
Quick attempt to get pull requests passing
2017-04-04Quick attempt to get pull requests passingKurtis Rainbolt-Greene
2017-04-04typo in admin docNope Nope
s/rails/rake/
2017-04-04Add file packageAngristan
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
2017-04-04Spawn FeedInsertWorker to deliver status into personal feedEugen Rochko
2017-04-04Fix typos on french translationsClément D
2017-04-04Add oc.todon.fr to the list of instances.Valentin Lorentz
[SKIP CI]
2017-04-04Use active record shorthandKurtis Rainbolt-Greene
2017-04-04Fix crontab editAngristan
Missing -u parameter to specify the mastodon user.
2017-04-04[#817] Add email whitelistPete Keen
This adds the ability to filter user signup with a whitelist instead of or in addition to a blacklist. Fixes #817
2017-04-04Update social.diskseven.com's IPv6 statusJo Decker
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-04Add mastodon.club to running instances listAdam Thurlow
2017-04-04Missing quotesAngristan
2017-04-04New admin setting: open/close registrations, with custom message, from the ↵Eugen Rochko
admin UI
2017-04-04updated line 28 about GitHubJantsoP
2017-04-04Merge pull request #804 from fhalna/developmentEugen
Accessibility Fix.
2017-04-04Merge pull request #803 from 0xa/patch-1Eugen
Add octodon.social
2017-04-04Merge branch 'master' into patch-1Eugen
2017-04-04Merge pull request #800 from unascribed/patch-1Eugen
Add fern.surgeplay.com to the instances list
2017-04-04Merge pull request #799 from Wonderfall/masterEugen
update social.targaryen.house info
2017-04-04Merge pull request #832 from ndarville/patch-1Eugen
Fix typo in ISSUE_TEMPLATE
2017-04-04Merge pull request #788 from yiskah/patch-5Eugen
Add instances from instances.mastodon.xyz
2017-04-04Fix typo in ISSUE_TEMPLATENiclas Darville
2017-04-04Merge pull request #815 from walfie/patch-1Eugen
Fix typo in Heroku guide
2017-04-04Merge pull request #816 from leowzukw/patch-1Eugen
More consistent typography
2017-04-04Merge pull request #831 from ndarville/patch-1Eugen
Create ISSUE_TEMPLATE.md to bring down duplicate issues
2017-04-04Create ISSUE_TEMPLATE.mdNiclas Darville
2017-04-04Remove sidekiq-mergerEugen Rochko