about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-06-15Port 85470ec872a39c475d872f685dadeac849832a98 to glitch emoji picker.David Yip
2018-06-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-15Bump version to 2.4.2rc1Eugen Rochko
2018-06-15Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor (#7810)Eugen Rochko
2018-06-15Fix regression where CW is focused on reply (#7811)Eugen Rochko
2018-06-15Remove rack-timeout (#7809)Eugen Rochko
2018-06-15Add autofollow option to invites (#7805)Eugen Rochko
2018-06-15Fix vertical alignment of navigation bar (#7807)Eugen Rochko
2018-06-15Remove placeholder text for media-only toots (#7806)Eugen Rochko
2018-06-15Add "find friends", "invite people", and more to getting started footer (#7803)Eugen Rochko
2018-06-15Put "Media Only" option in column settings instead of content area headline (...chr v1.x
2018-06-14Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-14Hide status content when spoiler text is not empty (#7797)Yamagishi Kazutoshi
2018-06-14Fix "Invalid DOM property `class`" (#7798)Yamagishi Kazutoshi
2018-06-13Merge pull request #540 from lanodan/glitch-soc-pr/charLimitDavid Yip
2018-06-14Add tests for following accounts controller (#7800)Shuhei Kitagawa
2018-06-14Handle character limit in initial state in frontend.Lain Iwakura
2018-06-13Add profile options on compose form (#7789)chr v1.x
2018-06-13Add tests for followers_accounts_controller (#7794)Shuhei Kitagawa
2018-06-12Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12Merge pull request #539 from glitch-soc/merge-upstreamDavid Yip
2018-06-12keyword mute: Add missing scope for regex escape testDavid Yip
2018-06-12Port emojimart 2.6.1 changes to glitch flavourDavid Yip
2018-06-12keyword mute: use mentions scope in home feed filtering (#454)David Yip
2018-06-12Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-...David Yip
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-12Add missing tests for admin/accounts_controller (#7791)Shuhei Kitagawa
2018-06-10Bump version to 2.4.1Eugen Rochko
2018-06-10Uniform media and video spoiler settings and fix them of the light theme (#7778)Lynx Kotoura
2018-06-10Weblate translations (2018-06-10) (#7779)Yamagishi Kazutoshi
2018-06-10Control the focus when clicking the "CW" button. (#7776)kedama
2018-06-10Rename emoji sheet to avoid caching issue (#7777)Renato "Lond" Cerqueira
2018-06-10Bump version to 2.4.1rc4Eugen Rochko
2018-06-10Migration to cleanup blocked users that are still following (#7773)nightpool
2018-06-09Add tests for intents_controller (#7763)Shuhei Kitagawa
2018-06-09Fix domain hiding logic (#7765)Eugen Rochko
2018-06-09Fix background color of emoji-mart-bar in light theme (#7768)Lynx Kotoura
2018-06-09Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)Lynx Kotoura
2018-06-09Fix has_one association on Web::PushSubscription (#7767)Eugen Rochko
2018-06-09Ensure emoji-mart dependency is updated (#7771)Eugen Rochko
2018-06-09Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constantsDavid Yip
2018-06-09Delete references to removed constants (fixes #537)Thibaut Girka
2018-06-09Merge pull request #506 from ThibG/glitch-soc/fixes/static-500David Yip
2018-06-09Update Chinese (Simplified) translations (#7769)SerCom_KC
2018-06-09Migrate old web push subscriptions to ensure deliveries (#7764)Eugen Rochko
2018-06-08Fix issues with updated emoji mart (#7761)Renato "Lond" Cerqueira
2018-06-08Merge pull request #535 from glitch-soc/merge-upstreamDavid Yip
2018-06-08Weblate translations (2018-06-08) (#7759)Yamagishi Kazutoshi
2018-06-08Do not accept ActivityPub follow requests from blocked user (#7756)Eugen Rochko