132 Commits (07592234ac1e2ce9de5c6096df1f2b71e1d34703)

Author SHA1 Message Date
Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9244a06846 Add CSV export for lists and domain blocks (#9677)
6 years ago
Thibaut Girka cabf2772ea Add a per-user setting to hide followers count
6 years ago
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ysksn 8996de49df Create Settings::BaseController (#9507)
6 years ago
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 097d866028 Add setting to not aggregate reblogs (#9248)
6 years ago
Eugen Rochko fd8ca11f19 Add profile directory (#9427)
6 years ago
Thibaut Girka c32a5f86b6 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi cad03e69b3 Set @body_classes to admin layout (#9081)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ふぁぼ原 bb8afc4608 Add a new preference to always hide all media (#8569)
6 years ago
Matt Sweetman 674865731a Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
Thibaut Girka 7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 00d1699a96 Whitelist report notification param in Settings::NotificationsController (#8560)
6 years ago
Eugen Rochko 601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Thibaut Girka 262f7d147d Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
6 years ago
David Yip 4692eed7bd Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko b051d74029 Fix domain hiding logic (#7765)
7 years ago
David Yip a38c4c45da Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko fd007264dc Enforce order on authorized applications page (#7587)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins c91bd06fa5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko db96a5ca80 Ensure unfilled fields are shown when errors are shown (#7523)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
Thibaut Girka f7d23998c8 Fix migration page style
7 years ago
imncls 1e64435374 Fix data export page error
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 53854707ce Thank you, Officer Murphy
7 years ago
David Yip ec1199404c The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 28e652d35d Allow for user object to be empty. Fixes #317.
7 years ago
David Yip ea1c58f6d8 Set packs on 2FA-related pages. Fixes #271.
7 years ago
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago