about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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-04Use active record shorthandKurtis Rainbolt-Greene
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-04New admin setting: open/close registrations, with custom message, from the ↵Eugen Rochko
admin UI
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
2017-04-04Reduce number of items in feeds, optimize regeneration worker slightly,Eugen Rochko
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04Optimize FeedManager#unmerge, and slightly optimize FeedManager#mergeEugen Rochko
2017-04-04Move OStatus processing back into default queueEugen Rochko
2017-04-04Optimize filter methods in FeedManager a bit, use redis pipelining on ↵Eugen Rochko
merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
2017-04-04Merge branch 'master' into developmenthalna_Tanaguru
2017-04-04More consistent typographyLeo Wzukw
2017-04-04Fix typo in Heroku guidewalfie
2017-04-04Fix #808 - smaller elephant friend PNG for frontpageEugen Rochko
2017-04-04Only call regeneration worker after first login after a 14 day breakEugen Rochko
2017-04-04Fix ActionController::Parameters in API issueEugen Rochko
2017-04-04Separate background jobs into different queues. ATTENTION: new queue "pull"Eugen Rochko
must be added to the Sidekiq invokation in your systemd file The pull queue will handle link crawling, thread resolving, and OStatus processing. Such tasks are more likely to hang for a longer time (due to network requests) so it is more sensible to not make the "in-house" tasks wait for them.
2017-04-03Changed "reblogs" to "boosts"Neville Park
2017-04-03Add octodon.socialAlice
2017-04-03Add check for visibility.nil? even though it can't ever be, to check for ↵Eugen Rochko
race conditions
2017-04-03accessibility fixhalna_Tanaguru
eanable focus on ClearColumnButton