about summary refs log tree commit diff
path: root/app
AgeCommit message (Expand)Author
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
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 tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-15Replace =~ with #matches?. #208.David Yip
2017-11-15Prefix cache keys with the matcher type. #208.David Yip
2017-11-15Match keyword mute filter on hashtags. #208.David Yip
2017-11-15Also run the keyword matcher on a status' tags. #208.David Yip
2017-11-15Merge pull request #212 from aschmitz/feat/mute-reblogsbeatrix
2017-11-15Delegate some methods of User to @settings (#5706)ysksn
2017-11-15reusable-streaming (#5709)masarakki
2017-11-15Optional notification muting (#5087)Surinna Curtis
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-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 uniqueness to block email domains (#5692)Yamagishi Kazutoshi
2017-11-14i18n: Update Polish translation (#5699)Marcin Mikołajczak
2017-11-14Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.Lain Iwakura
2017-11-14Code style fixes.Lain Iwakura
2017-11-14Handle character limit in initial state in frontend.Lain Iwakura
2017-11-14Return character limit in API and initial state.Lain Iwakura
2017-11-14Make character limit configurable.Lain Iwakura
2017-11-14Updates and fixes to win95 themeAndrew
2017-11-14l10n: PT-BR translation updated (#5681)Anna e só
2017-11-13Maintain case-insensitivity when merging multiple matchers (#213)David Yip
2017-11-12Update model annotations to use BIGINT for IDs (#5461)Daniel Hunsaker
2017-11-11Actually filter blocked reblogs from feedaschmitz
2017-11-12Fix #5632 - Reset column loading status after fetch fail (#5659)Eugen Rochko
2017-11-11Don't update follower counts on reblog toggleaschmitz
2017-11-11Updates per code reviewaschmitz
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
2017-11-11Retry thread resolving (#5599)ThibG
2017-11-10Per-user reblog hiding implementation/fixes/testsaschmitz
2017-11-09Fix focused background color of direct toots (#5642)Lynx Kotoura
2017-11-09"Show reblogs" per-follower UI/database changesaschmitz
2017-11-09Add and Remove tests for FollowRequest (#5622)ysksn
2017-11-09Show confirmation dialog on leaving WebUI while composing (#5616)unarist
2017-11-08i10n OC: Memorial (#5615) + #5467 (#5623)Quenty31
2017-11-07Fix process mentions for local users, as local users are considered to use OS...ThibG
2017-11-07Eliminate space around emoji (#5474)nullkal
2017-11-07Twidere mention workaround (#5552)ThibG
2017-11-07Add ability to disable login and mark accounts as memorial (#5615)Eugen Rochko
2017-11-07fix: slang to adequate word (#5453)voidSatisfaction
2017-11-07 Show the local couterpart of emoji when it exists in /admin/custom_emojis (#...nullkal
2017-11-07Avoid emojifying on invisible text (#5558)MIYAGI Hikaru
2017-11-07Do not process undeliverable mentions (#5598)ThibG