about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-06-12Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-...David Yip
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-08Merge pull request #535 from glitch-soc/merge-upstreamDavid Yip
2018-06-07Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2018-06-06Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigationDavid Yip
2018-06-07🌍🇵🇱 (#7753)Marcin Mikołajczak
2018-06-06Bump version to 2.4.1rc3Eugen Rochko
2018-06-06Filter out blocked/muted people from profile timelines (#7747)Eugen Rochko
2018-06-06Fix fetch of remote image with multiple Content-Type headers (#7749)Yamagishi Kazutoshi
2018-06-06Preserve newlines in delete & redraft and desktop notifications (#7750)Eugen Rochko
2018-06-06Add missing dot for remote image (#7751)Yamagishi Kazutoshi
2018-06-05Merge pull request #534 from glitch-soc/restructure-kw-as-word-listsDavid Yip
2018-06-06Add missing tests for sessions controller (#7744)Shuhei Kitagawa
2018-06-05Weblate translations 20180605 (#7743)Renato "Lond" Cerqueira
2018-06-06Add missing locale strings (#7742)Renato "Lond" Cerqueira
2018-06-05Bump version to 2.4.1rc2Eugen Rochko
2018-06-05Escape metacharacters in non-whole-word keyword mutes. Fixes #533.David Yip
2018-06-05Add redraft function (#7735)Eugen Rochko
2018-06-04Merge pull request #530 from glitch-soc/restructure-kw-as-word-listsDavid Yip
2018-06-04Fix context performance by partially reverting #7083 (#7734)nightpool
2018-06-04Detect extname from Content-Type (#7733)Yamagishi Kazutoshi
2018-06-04fix RuboCop error (#7442)Chikahiro Tokoro
2018-06-04Skip processing when HEAD method returns 501 (#7730)Yamagishi Kazutoshi
2018-06-04Add vendor prefix for background-clip (#7727)Yamagishi Kazutoshi
2018-06-04Change border color of activity-stream (#7724)Lynx Kotoura
2018-06-04Submit report using meta key (#7729)Yamagishi Kazutoshi
2018-06-04Remove unnecessary underline on accounts table (#7728)Yamagishi Kazutoshi
2018-06-04Add apply-to-mentions option to keyword mute UI. #454.David Yip
2018-06-03Add a FeedManager example demonstrating non-mention keywords. #454.David Yip
2018-06-03Fix spacing in some FeedManager examples.David Yip
2018-06-03Thread scopes through #matches?. #454.David Yip
2018-06-04Display numbers in account header using shortNumberFormat for consistency (#7...Eugen Rochko
2018-06-04Do not mark remote status sensitive even if spoiler text is present (#7395)Akihiko Odaki
2018-06-04Fix activity-stream-tabs colors and set text variables for text colors (#7722)Lynx Kotoura
2018-06-04Fix missing column in select in mastodon:feeds:build task (#7720)Eugen Rochko
2018-06-04Fix bug in order of conversations in web UI (#7721)Eugen Rochko
2018-06-04Add tests for embeds controller (#7719)Shuhei Kitagawa
2018-06-04"Show" instead of "return to" after (remote)-following (#7718)Eugen Rochko
2018-06-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-06-04Remove trending hashtags (#7711)Eugen Rochko
2018-06-03keyword mute: Store keywords as a listDavid Yip
2018-06-03Merge pull request #529 from glitch-soc/tweak-491David Yip
2018-06-03prefs: Note that favourite confirmation applies to Glitch flavour only (#491)David Yip
2018-06-03Merge pull request #528 from glitch-soc/merge-upstreamDavid Yip
2018-06-03Whoops, forgot to clean up a conflict.David Yip
2018-06-02Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-nullDavid Yip
2018-06-02Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-06-02Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip