about summary refs log tree commit diff
AgeCommit message (Expand)Author
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-04Merge branch 'master' into masterJantsoP
2017-04-04updated translationJantsoP
2017-04-04changed line 25 for better translationJantsoP
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
2017-04-03Add octodon.socialAlice
2017-04-03Add check for visibility.nil? even though it can't ever be, to check for race...Eugen Rochko
2017-04-03accessibility fixhalna_Tanaguru
2017-04-03Add fern.surgeplay.com to the instances listAesen
2017-04-03update social.targaryen.house infoWonderfall
2017-04-03Fix norwegian translation being malformedEugen Rochko
2017-04-03Add basic logging of who resolved reportEugen Rochko
2017-04-03When taking action on a report (silence/suspend), it dismisses all otherEugen Rochko
2017-04-03Updated and fixed orthographyKorbinian
2017-04-03Updated and fixed german orthographyKorbinian
2017-04-03Make default admin UI page reports. Add admin UI for creating a domain blockEugen Rochko
2017-04-03Add instances from instances.mastodon.xyzshel
2017-04-03Merge pull request #777 from chriswk/masterEugen
2017-04-03Merge pull request #782 from wxcafe/patch-1Eugen
2017-04-03Merge pull request #784 from singingwolfboy/github-capitalizedEugen
2017-04-03GitHub should be capitalizedDavid Baumgold
2017-04-03Adds social.wxcafe.netwxcafé
2017-04-03Add Norwegian localeChristopher Kolstad
2017-04-03Merge pull request #775 from JantsoP/masterEugen
2017-04-03another typo. fuck meJantsoP
2017-04-03fixed an sneaky peaky tpyJantsoP
2017-04-03add finnish translationJantsoP
2017-04-03add finnish translationJantsoP
2017-04-03fixed typoJantsoP