about summary refs log tree commit diff
path: root/app/controllers/settings
AgeCommit message (Expand)Author
2018-09-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-09-02Whitelist report notification param in Settings::NotificationsController (#8560)Eugen Rochko
2018-09-02Add preference for report notification e-mails, skip for duplicates (#8559)Eugen Rochko
2018-07-09Migrate glitch-soc keyword mutes to Mastodon'sThibaut Girka
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-17Allow selecting default posting language instead of auto-detect (#7828)Eugen Rochko
2018-06-17Change language opt-out to language opt-in (#7823)Eugen Rochko
2018-06-12Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-09Fix domain hiding logic (#7765)Eugen Rochko
2018-06-04Add apply-to-mentions option to keyword mute UI. #454.David Yip
2018-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-22Enforce order on authorized applications page (#7587)Eugen Rochko
2018-05-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-18Add preference to hide following/followers lists (#7532)Eugen Rochko
2018-05-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-17Ensure unfilled fields are shown when errors are shown (#7523)Eugen Rochko
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
2018-05-07Bot nameplates (#7391)Eugen Rochko
2018-05-02Slightly reduce RAM usage (#7301)Eugen Rochko
2018-04-14Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-14Add bio fields (#6645)Eugen Rochko
2018-04-13Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-12Upgrade Rails to version 5.2.0 (#5898)Yamagishi Kazutoshi
2018-03-30Fix migration page styleThibaut Girka
2018-02-24Fix data export page errorimncls
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
2018-02-21Account archive download (#6460)Eugen Rochko
2018-02-09Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-09Add preference to always display sensitive media (#6448)Eugen Rochko
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-21Redirect to 2FA creation page when otp_secret is not available (#6314)Aboobacker MK
2018-01-10Thank you, Officer MurphyDavid Yip
2018-01-10The flavour parameter is unused, so omit it (#317)David Yip
2018-01-10Allow for user object to be empty. Fixes #317.David Yip
2017-12-20Set packs on 2FA-related pages. Fixes #271.David Yip
2017-12-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-14Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)Eugen Rochko
2017-12-10Moved flavour UI into own prefs tabkibigo!
2017-12-09add initial components based off of tootsuite pr #1507cwm
2017-12-06Prepend check_enabled_deletion to Settings::DeletesController (#229)David Yip
2017-12-04Various fixeskibigo!
2017-12-04Merge branch 'gs-master' into glitch-themeDavid Yip
2017-11-30Skins supportkibigo!
2017-11-28Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-28Fix account migration feature (#5837)nullkal
2017-11-27Merge remote-tracking branch 'tootsuite/master'David Yip
2017-11-27Add UI for setting up account migration (#5832)Eugen Rochko
2017-11-20Finalized theme loading and stuffkibigo!
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
generated by cgit-pink (git 2.37.1) at 2024-11-19 16:41:05 +0000