about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-11-05Merge pull request #206 from glitch-soc/autocollapse-boostDavid Yip
2017-11-05Autocollapse boosts optionkibigo!
2017-11-04Merge pull request #204 from glitch-soc/with-mastodon-gobeatrix
2017-11-04Introducing: Mastodon GO!kibigo!
2017-11-03add memorial to production.rbbeatrix
2017-10-27Merge branch 'master' into gs-masterDavid Yip
2017-10-27Feature: Unlisted custom emojis (#5485)nullkal
2017-10-27Allow ActivityPub Note's tag and attachment to be single objects (#5534)puckipedia
2017-10-27Optimize FixReblogsInFeeds migration (#5538)unarist
2017-10-26Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-10-26Fix copying emojos: redirect to the page you were on (#5509)erin
2017-10-26Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-26Fix column design broken with very long title (#5493)りんすき
2017-10-26Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)unarist
2017-10-26Remove translateZ(0) on modal overlay (#5478)Nolan Lawson
2017-10-25Merge pull request #179 from glitch-soc/keyword-mutebeatrix
2017-10-25Merge pull request #198 from glitch-soc/gs-direct-timelinebeatrix
2017-10-25Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-d...David Yip
2017-10-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-10-26Update Russian translation (#5517)Ratmir Karabut
2017-10-25l10n: PT-BR translation updated (#5530)Anna e só
2017-10-25Complete Esperanto translation (#5520)Olivier Nicole
2017-10-24Remove nil check in Glitch::KeywordMute#=~.David Yip
2017-10-24Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.David Yip
2017-10-24Use edit template for displaying errors in update.David Yip
2017-10-24Also filter notifications containing muted keywords.David Yip
2017-10-24Override Action View name inference in settings/keyword_mutes.David Yip
2017-10-24Fix example description.David Yip
2017-10-24Switch to Regexp.union for building the mute expression.David Yip
2017-10-24option to add title to <Button>, use for toot buttons (#197)Ondřej Hruška
2017-10-23Merge pull request #196 from glitch-soc/fix-importsDavid Yip
2017-10-23Added app/javascript for importskibigo!
2017-10-23Only cache the regex text, not the regex itself.David Yip
2017-10-22Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-22Changes to match other timelines in 2.0Matthew Walsh
2017-10-22Added a timeline for Direct statusesMatthew Walsh
2017-10-22KeywordMute matcher: more closely mimic Regexp#=~ behavior.David Yip
2017-10-22Address unused translation errors.David Yip
2017-10-22Use current_account from ApplicationController.David Yip
2017-10-22Don't add \b to whole-word keywords that don't start with word characters.David Yip
2017-10-22keyword mutes: also check spoiler (CW) text and reblogged statuses.David Yip
2017-10-22i18n: Update Polish Translation (#5494)Marcin Mikołajczak
2017-10-21Apply keyword mutes to reblogs.David Yip
2017-10-21Move KeywordMute into Glitch namespace.David Yip
2017-10-21Fill in create, edit, update, and destroy for keyword mutes interface.David Yip
2017-10-21Allow keywords to match either substrings or whole words.David Yip
2017-10-21Spike out index and new views for keyword mutes controller.David Yip
2017-10-21Set up /settings/keyword_mutes. #164.David Yip
2017-10-21Invalidate cached matcher objects on KeywordMute commit. #164.David Yip
2017-10-21Use more idiomatic string concatentation. #164.David Yip