97 Commits (21837b291ef24b75e618974925799e666353dcca)

Author SHA1 Message Date
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