3394 Commits (a36a2c17964ee4cb3b1d6471769e765db0d9f90d)

Author SHA1 Message Date
Jenkins a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 2bcc81700c Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
7 years ago
abcang 53e95c4efc Fix N+1 at notification (#5752)
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
beatrix bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
kibigo! 92cc79be72 Enabled vanilla thmee
7 years ago
kibigo! 08a01dd037 Public pack fix
7 years ago
kibigo! 672ace5a20 Media styling
7 years ago
kibigo! f51f7b0e06 Font styles are now packagified
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
beatrix dec960c828
Merge pull request #208 from yipdw/keyword-mute
7 years ago
Jenkins eed50514be Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 6be72a3ec6 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! fc2c8b50dd Removed glitch tests
7 years ago
kibigo! e19fc6a9f8 Restore vanilla components
7 years ago
kibigo! 45c44989c8 Forking glitch theme
7 years ago
beatrix 5a9982b425
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
7 years ago
David Yip 130aa90d55 Update annotations on Follow, FollowRequest, and Mute.
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
David Yip 6f8ccbfcdf
Merge pull request #222 from yipdw/merge/tootsuite/master
7 years ago
David Yip dc16d73bf5 Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
7 years ago
beatrix b006bb82af
Merge pull request #221 from glitch-soc/local-only-policy
7 years ago
Jenkins 94c5a11cda Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 45f18b8f49
Merge pull request #218 from glitch-soc/themed-prefetching
7 years ago
Lynx Kotoura 4a2fc2d444 Increase contrast of Admin badges (#5740)
7 years ago
Clworld e1ebf36352 Fix regression #5467: fixes emoji copy (#5739)
7 years ago
David Yip f6355f6ffb Update StatusPolicy to check current_account for local_only? toots.
7 years ago
unarist e28b33c89c Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
David Yip 2a386ad88d
Add trailing comma in mapStateToProps
7 years ago
David Yip fbf76feb37
Merge pull request #219 from glitch-soc/no-spin
7 years ago
David Yip 392945f9a3 Throw layout, isWide, navbarUnder back into mapStateToProps.
7 years ago
kibigo! 4dd19054d6 Removes spin theme
7 years ago
kibigo! 585758a373 Themed prefetching
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Eugen Rochko 3e90987c8b Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Renato "Lond" Cerqueira ad207456d6 Improve language filter (#5724)
7 years ago
ysksn 9e3d24a150 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
David Yip 08652baab0 Replace =~ with #matches?. #208.
7 years ago
David Yip 8fc54890e5 Prefix cache keys with the matcher type. #208.
7 years ago
David Yip cb4ef24ac9 Match keyword mute filter on hashtags. #208.
7 years ago
David Yip 431503bae2 Also run the keyword matcher on a status' tags. #208.
7 years ago
beatrix 04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 19e8b861a2 Delegate some methods of User to @settings (#5706)
7 years ago
masarakki c73a1fb537 reusable-streaming (#5709)
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago