162 Commits (7039dca12cf926fecbb2eb4fbba1461af5cb91c2)

Author SHA1 Message Date
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 10f51c9886
Fix domain hiding logic (#7765)
7 years ago
David Yip 97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 36e47a31e3
Enforce order on authorized applications page (#7587)
7 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 2636a23092 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 7293b9fc61
Ensure unfilled fields are shown when errors are shown (#7523)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
Thibaut Girka 167a2ecde0 Fix migration page style
7 years ago
imncls 3afc6174f5
Fix data export page error
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 395e64e858
Thank you, Officer Murphy
7 years ago
David Yip 514db316f7
The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 6fcb870d96
Allow for user object to be empty. Fixes #317.
7 years ago
David Yip bf1eb0912c
Set packs on 2FA-related pages. Fixes #271.
7 years ago
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a3b2ea599d
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
David Yip 017fc81caf
Prepend check_enabled_deletion to Settings::DeletesController (#229)
7 years ago
kibigo! 5bed0f10ed Various fixes
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
nullkal 1b57d4dd3a Fix account migration feature (#5837)
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
David Yip d9485e6497 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
7 years ago
David Yip d5c8ebe205 Use edit template for displaying errors in update.
7 years ago
David Yip 4c84513e04 Use current_account from ApplicationController.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 2e03a10059 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
Akihiko Odaki cdacac8c6c Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
masarakki 649a20ab46 authorize-follow-requests-after-unlocking (#4658)
7 years ago
nullkal 80393a23d0 Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Eugen Rochko 92cb451da8 Fix #4026 - Accept backup codes for disabling 2FA (#4382)
7 years ago
Yamagishi Kazutoshi 716f4cb11c Add feature to revoke sessions (#4259)
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
Eugen Rochko c42092ba7a Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
Yamagishi Kazutoshi 2b9721d1b3 Add setting a always mark media as sensitive (#4136)
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Eugen Rochko 5e8d037e27 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
masarakki ff142eb64d setting-for-account-deletable (#3852)
8 years ago
Eugen Rochko 91c71471ab Fix account delete form not accepting password, update suspended (#3745)
8 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
8 years ago
takayamaki 3eedad2737 change sidekiq queueing to bulk push (#3536)
8 years ago
Matt Jankowski 0ebe7d6d23 Remove exports/base controller in favor of shared concern (#3444)
8 years ago
Atsushi Yamamoto 402c19a924 Add preference setting for delete toot modal (#3368)
8 years ago
Tomonori Murakami 7966d3a872 Fix locale bug when change it on preferences (#3223) (#3232)
8 years ago
Matt Jankowski 8f4b7c1820 Filter languages with opt out (#3175)
8 years ago
Matt Jankowski f025cc6782 Filter on allowed user language preferences (#2361)
8 years ago
Eugen 501514960a Followers-only post federation (#2111)
8 years ago
Matt Jankowski 67dea31b0f 2FA controller cleanup (#2296)
8 years ago
Matt Jankowski 2dda356e3f Clean up settings/preferences controller (#2237)
8 years ago
Matt Jankowski a8e1afc30a Simplify render in controllers (#2144)
8 years ago
Eugen Rochko 42d54dc9ea Adjust visuals of non-autoplaying GIFV
8 years ago
Patrick Figel ffb99325ca Add gif auto-play/pause preference
8 years ago
Patrick Figel df4ff9a8e1 Add recovery code support for two-factor auth (#1773)
8 years ago
Matt Jankowski 0e39cc6a35 Settings export refactor (#1646)
8 years ago
Matt Jankowski 7f0a865b05 Allow import/export of mutes list (#1541)
8 years ago
Matt Jankowski 3ddd936b03 Refactor exports controller (#1567)
8 years ago
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences
8 years ago
Matt Jankowski 0687ab8ae3 Clean up generation of account webfinger string (#1477)
8 years ago
Eugen 9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko 56d998cbdb Export follow/block lists as CSV
8 years ago
Eugen Rochko 6b81d10030 Add digest e-mails
8 years ago
Eugen Rochko 175a9b9caa Fix #104 - Style OAuth authorized applications page
8 years ago
Eugen Rochko 63886bdc59 Fix #587 - Display TOTP secret next to QR code
8 years ago
Eugen Rochko 714e41d472 Fix preferences save
8 years ago
Eugen Rochko 347a153b3d Add API modifiers to limit returned toots from public/hashtag timelines
8 years ago
Eugen Rochko f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms
8 years ago
Eugen Rochko ba192f12e3 Added optional two-factor authentication
8 years ago
Eugen Rochko b11fdc3ae3 Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
8 years ago