about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-04-05Merge pull request #866 from kklleemm/patch-1Eugen
2017-04-05Merge pull request #792 from chapeaumeinfreund/masterEugen
2017-04-05Merge pull request #790 from chapeaumeinfreund/patch-1Eugen
2017-04-05Merge pull request #852 from peterkeen/email-whitelist-817Eugen
2017-04-05Merge pull request #891 from ashfurrow/patch-1Eugen
2017-04-05Merge pull request #805 from nevillepark/masterEugen
2017-04-05Merge pull request #894 from asm/mastodon_ccEugen
2017-04-05Merge pull request #898 from SirCmpwn/remote-follow-improvementsEugen
2017-04-05Merge pull request #858 from krainboltgreene/patch-6Eugen
2017-04-04Updates instructions.Ash Furrow
2017-04-05Merge pull request #872 from kwaio/patch-1Eugen
2017-04-04Remote follow improvementsDrew DeVault
2017-04-05Merge pull request #868 from Angristan/patch-4Eugen
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
2017-04-04Quick attempt to get pull requests passingKurtis Rainbolt-Greene
2017-04-04typo in admin docNope Nope
2017-04-04Add file packageAngristan
2017-04-04Spawn FeedInsertWorker to deliver status into personal feedEugen Rochko
2017-04-04Fix typos on french translationsClément D
2017-04-04Use active record shorthandKurtis Rainbolt-Greene
2017-04-04[#817] Add email whitelistPete Keen
2017-04-04New admin setting: open/close registrations, with custom message, from the ad...Eugen Rochko
2017-04-04Merge pull request #804 from fhalna/developmentEugen
2017-04-04Merge pull request #803 from 0xa/patch-1Eugen
2017-04-04Merge branch 'master' into patch-1Eugen
2017-04-04Merge pull request #800 from unascribed/patch-1Eugen
2017-04-04Merge pull request #799 from Wonderfall/masterEugen
2017-04-04Merge pull request #832 from ndarville/patch-1Eugen
2017-04-04Merge pull request #788 from yiskah/patch-5Eugen
2017-04-04Fix typo in ISSUE_TEMPLATENiclas Darville
2017-04-04Merge pull request #815 from walfie/patch-1Eugen
2017-04-04Merge pull request #816 from leowzukw/patch-1Eugen
2017-04-04Merge pull request #831 from ndarville/patch-1Eugen
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
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 merge/u...Eugen Rochko
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
2017-04-03Changed "reblogs" to "boosts"Neville Park