77 Commits (97469efc3581b213a92d5f5caf70a6e81288ce50)

Author SHA1 Message Date
David Yip 017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Lynx Kotoura c268118e5b Scrollable tables in settings pages (#4857)
7 years ago
Eugen Rochko a27821f725 Fix language filter codes (#4841)
7 years ago
Yamagishi Kazutoshi 5482e0d10e Add label for application scopes (#4691)
7 years ago
nullkal da85aff49c Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko b13501268f Fix up the applications area (#4664)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
Lynx Kotoura b7482e4a9f Fix autocomplete option in haml files (#4438)
7 years ago
beatrix-bitrot 8deb2072ef Merge that good fresh upstream shit
7 years ago
Eugen Rochko c35ea3636c Fix #3220 - Show avatar/header on edit profile page (#4288)
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Eugen Rochko 7d8fd050eb Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Yamagishi Kazutoshi 865f5170a8 Add setting a always mark media as sensitive (#4136)
7 years ago
Damien Erambert 387de88e2f Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
beatrix-bitrot cdcb74ffb6 Merge remote-tracking branch 'upstream/master'
8 years ago
beatrix-bitrot ecfb516588 update bio length to 500
8 years ago
Eugen Rochko b90a44b6d0 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
8 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
8 years ago
Atsushi Yamamoto 4547e3585a Add preference setting for delete toot modal (#3368)
8 years ago
Eugen Rochko 9ade22cd04 Improve language filter preferences look (#3184)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
Eugen Rochko ae6984de48 Fix character counter not updating for bio (#3101)
8 years ago
Stephen Burgess 095c99fb53 feat(count): Just yml count syntax to provide different rule for 1 (#2685)
8 years ago
Yamagishi Kazutoshi cd27deb5e3 Prevent selection of unacceptable Content-Type files (#2910)
8 years ago
yhirano cf1f65bf58 Added haml-lint and fix warnings (#2773)
8 years ago
AA4ch1 91642ec801 Fix language selector on preferences page (#2794)
8 years ago
Matt Jankowski c44ef23e50 Filter on allowed user language preferences (#2361)
8 years ago
Eugen f89e26bdd5 Followers-only post federation (#2111)
8 years ago
Matt Jankowski 502eef6f8d 2FA controller cleanup (#2296)
8 years ago
Sebastian Morr 6a85e79583 Display remaining characters when editing display name and bio (#2219)
8 years ago
Matt Jankowski be1ecde300 Clean up settings/preferences controller (#2237)
8 years ago
Matt Jankowski 2a86067f5e Simplify renders in views (#2084)
8 years ago
Eugen Rochko 336fd904db Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
Patrick Figel 2fb1f07888 Add gif auto-play/pause preference
8 years ago
Yuki Nakagawa 6572daada5 Optimize user setting page for mobile browser (#1924)
8 years ago
Matt Jankowski dce20ec3f5 Use local vars in partials (#1935)
8 years ago
Eugen 8270e11295 Fix up recovery codes design a little (#1866)
8 years ago
Patrick Figel 15b393201e Add recovery code support for two-factor auth (#1773)
8 years ago
Matt Jankowski 0a6cfca260 Settings export refactor (#1646)
8 years ago
Matt Jankowski bf7306636e Allow import/export of mutes list (#1541)
8 years ago
Matt Jankowski 63e46e27f0 Refactor exports controller (#1567)
8 years ago
blackle e7d77f4e13 Allow user to disable the boost confirm dialog in preferences
8 years ago
Eugen b532134503 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Eugen Rochko 244da78105 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko 74fb333eb7 Fix up some localizations
8 years ago