about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-11-18Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-18Updating Chinese (Simplified) translations (#5725)SerCom_KC
2017-11-18Make it possible to bind streming service to 0.0.0.0 (#5744)Baptiste Gelez
2017-11-17Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status...beatrix
2017-11-17Merge pull request #224 from yipdw/merge-upstreamDavid Yip
2017-11-17Update annotations on Follow, FollowRequest, and Mute.David Yip
2017-11-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-11-18Lists (#5703)Eugen Rochko
2017-11-17Merge pull request #222 from yipdw/merge/tootsuite/masterDavid Yip
2017-11-17Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size'...David Yip
2017-11-17Merge pull request #221 from glitch-soc/local-only-policybeatrix
2017-11-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-17Merge pull request #218 from glitch-soc/themed-prefetchingDavid Yip
2017-11-17Increase contrast of Admin badges (#5740)Lynx Kotoura
2017-11-17Fix regression #5467: fixes emoji copy (#5739)Clworld
2017-11-17Change libinconv download URL to HTTPS (#5738)Alex Coto
2017-11-17Update StatusPolicy to check current_account for local_only? toots.David Yip
2017-11-17Move "Permissions" row into main table in /admin/accounts/:id (#5734)unarist
2017-11-17Add trailing comma in mapStateToPropsDavid Yip
2017-11-17Merge pull request #219 from glitch-soc/no-spinDavid Yip
2017-11-17Throw layout, isWide, navbarUnder back into mapStateToProps.David Yip
2017-11-16Removes spin themekibigo!
2017-11-16Themed prefetchingkibigo!
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Redirect to reports when moderator (#5733)Yamagishi Kazutoshi
2017-11-17Remove empty strings (#5732)ysksn
2017-11-17Fix some rubocop style issues (#5730)Eugen Rochko
2017-11-17Display moderator badge (green), admin badge changed to red (#5728)Eugen Rochko
2017-11-16Improve language filter (#5724)Renato "Lond" Cerqueira
2017-11-16Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)ysksn
2017-11-16Merge pull request #216 from glitch-soc/merge-upstream-3023725Surinna Curtis
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-16Add tests for Status#verb (#5717)ysksn
2017-11-15Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-envDavid Yip
2017-11-15Allow streaming server to take bindhost from HOST envDaggertooth
2017-11-16Add tests for Status#hidden? (#5719)ysksn
2017-11-15Merge pull request #212 from aschmitz/feat/mute-reblogsbeatrix
2017-11-15[Nanobox] Apply Release Notes Changes (#5670)Daniel Hunsaker
2017-11-15Delegate some methods of User to @settings (#5706)ysksn
2017-11-15Add a test for Tag#to_param (#5705)ysksn
2017-11-15reusable-streaming (#5709)masarakki
2017-11-15Add Japanese translation for DM block option. (#5704)mayaeh
2017-11-15Optional notification muting (#5087)Surinna Curtis
2017-11-15Add tests for StreamEntry (#5687)ysksn
2017-11-15Filter searched toots to be consistent with blocking behaviors (#5383)ThibG
2017-11-15Use already-known remote user data if resolving temporarily fails in mentions...ThibG
2017-11-15Allow specifying STATSD_NAMESPACE (#5700)Eugen Rochko
2017-11-14Add option to block direct messages from people you don't follow (#5669)Eugen Rochko
2017-11-14Updating Chinese (Simplified) translations (#5643)SerCom_KC
2017-11-14Add a test for SiteUpload#cache_key (#5685)ysksn