about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-05Merge branch 'master' into add_more_tests_to_modelsSamy KACIMI
2017-04-05update account_specSamy KACIMI
2017-04-05rollback database.yml updateSamy KACIMI
2017-04-05add more tests to modelsSamy KACIMI
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-04Spawn FeedInsertWorker to deliver status into personal feedEugen Rochko
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-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
2017-04-03Add fern.surgeplay.com to the instances listAesen
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.
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
reports for that user automatically
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
Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list
2017-04-03Merge pull request #777 from chriswk/masterEugen
Add Norwegian locale
2017-04-03Merge pull request #782 from wxcafe/patch-1Eugen
Adds social.wxcafe.net
2017-04-03Merge pull request #784 from singingwolfboy/github-capitalizedEugen
GitHub should be capitalized
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
Finnish Translation
2017-04-03another typo. fuck meJantsoP