108 Commits (6a0f32b359cedda23d33daa89b8bdf01c6207d65)

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