272 Commits (f0999de66f0d3f4f77728b379b30a7d601561847)

Author SHA1 Message Date
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
6 years ago
Jenkins 695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko b051d74029 Fix domain hiding logic (#7765)
6 years ago
David Yip a38c4c45da Add apply-to-mentions option to keyword mute UI. #454.
6 years ago
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko fd007264dc Enforce order on authorized applications page (#7587)
6 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
6 years ago
Jenkins c91bd06fa5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko db96a5ca80 Ensure unfilled fields are shown when errors are shown (#7523)
6 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
6 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
6 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
6 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
Eugen Rochko ef8fc3542b Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
David Yip 63c41247ff Prepend check_enabled_deletion to Settings::DeletesController (#229)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
nullkal 35e3791ba4 Fix account migration feature (#5837)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
David Yip 53c2ea1a86 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
7 years ago
David Yip 2da4eca986 Use edit template for displaying errors in update.
7 years ago
David Yip 156ebf53f6 Use current_account from ApplicationController.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
Akihiko Odaki 51f48c8960 Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
masarakki d8f136cb8b authorize-follow-requests-after-unlocking (#4658)
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
Eugen Rochko 5516767c75 ActivityPub delivery (#4566)
7 years ago
Eugen Rochko 84b40ce9a7 Fix #4026 - Accept backup codes for disabling 2FA (#4382)
7 years ago
Yamagishi Kazutoshi 9392d10250 Add feature to revoke sessions (#4259)
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
Eugen Rochko 7d8fd050eb Add option to opt out of search engines on public profile/status pages (#4199)
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
Eugen Rochko b90a44b6d0 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
masarakki d947978192 setting-for-account-deletable (#3852)
7 years ago
Eugen Rochko c883e96d95 Fix account delete form not accepting password, update suspended (#3745)
7 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
7 years ago
takayamaki aa6740c21b change sidekiq queueing to bulk push (#3536)
7 years ago
Matt Jankowski 18c81c74e5 Remove exports/base controller in favor of shared concern (#3444)
7 years ago
Atsushi Yamamoto 4547e3585a Add preference setting for delete toot modal (#3368)
7 years ago
Tomonori Murakami 323eeb096c Fix locale bug when change it on preferences (#3223) (#3232)
7 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
7 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
Matt Jankowski be1ecde300 Clean up settings/preferences controller (#2237)
8 years ago
Matt Jankowski 7a1129892c Simplify render in controllers (#2144)
8 years ago
Eugen Rochko a398b93bbc Adjust visuals of non-autoplaying GIFV
8 years ago
Patrick Figel 2fb1f07888 Add gif auto-play/pause preference
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
Eugen Rochko b440b2a9ee Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
blackle e7d77f4e13 Allow user to disable the boost confirm dialog in preferences
8 years ago
Matt Jankowski 874a240a58 Clean up generation of account webfinger string (#1477)
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 b339e488fe Export follow/block lists as CSV
8 years ago
Eugen Rochko 0cb5a2a0a7 Add digest e-mails
8 years ago
Eugen Rochko a741049a77 Fix #104 - Style OAuth authorized applications page
8 years ago
Eugen Rochko a83dc927d8 Fix #587 - Display TOTP secret next to QR code
8 years ago
Eugen Rochko af82038b98 Fix preferences save
8 years ago
Eugen Rochko b1f2683ecc Add API modifiers to limit returned toots from public/hashtag timelines
8 years ago
Eugen Rochko 557de8e24c Update settings to re-use admin layout, one big navigation tree, improve settings forms
8 years ago
Eugen Rochko 9b8670c939 Added optional two-factor authentication
8 years ago
Eugen Rochko 7e7c2bbb0f Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
8 years ago
Eugen Rochko fde1917a54 Add preferences for follow request notification e-mails
8 years ago
Eugen Rochko 09a477c782 Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
8 years ago
Eugen Rochko 7752662f97 Add filters for suspended accounts
8 years ago
Eugen Rochko 8d4ef0b6c3 Per-status control for unlisted mode, also federation for unlisted mode
8 years ago
Eugen Rochko ea0846645a Fix #65 - Options to block notifications from people you don't follow/who don't follow you
8 years ago
Alyssa Ross cb06801b21 Extract filename obfuscation into module
8 years ago
Andrea Faulds 66a20701b7 Rename media to avoid exposing filename (fixes #207)
8 years ago
Eugen Rochko 74df3ba1d7 Local accounts can control "silenced" attribute which removes them from public timeline
8 years ago
Eugen Rochko b8e6ca45e5 Add user locale setting
8 years ago
Eugen Rochko 0e956910c3 Adding some localizations
8 years ago
Eugen Rochko e71b152d89 Fix rubocop issues, introduce usage of frozen literal to improve performance
8 years ago
Eugen Rochko 588cb77e9f E-mail preferences page
8 years ago