about summary refs log tree commit diff
path: root/spec/controllers/settings
AgeCommit message (Expand)Author
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-06Remove setting that disables account deletes (#17683)Eugen Rochko
2022-10-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-09-20Add ability to filter followed accounts' posts by language (#19095)Eugen Rochko
2022-06-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-05-27Remove unused `filtered_languages` column (#18533)Claire
2022-05-11Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-05-10Fix typo in source `setted`->`set` (#18385)luzpaz
2022-03-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-03-28Fix test-related issues (#17888)Claire
2022-02-23Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-02-22Fix various typos (#17621)luzpaz
2022-01-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-01-28Refactor and improve tests (#17386)Claire
2021-11-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-11-26Remove Keybase integration (#17045)Eugen Rochko
2021-07-17Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-07-14Fix user email address being banned on self-deletion (#16503)Claire
2021-03-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-03-24Update Mastodon to Rails 6.1 (#15910)Claire
2021-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-02-02Fix race conditions on account migration creation (#15597)ThibG
2020-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-11-19Add import/export feature for bookmarks (#14956)ThibG
2020-09-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-09-11Refactor settings controllers (#14767)Eugen Rochko
2020-08-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-08-24Add WebAuthn as an alternative 2FA method (#14466)santiagorodriguez96
2020-05-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-05-10Add ability to remove identity proofs from account (#13682)Eugen Rochko
2019-12-19Merge branch 'master' into glitch-soc/masterThibaut Girka
2019-12-17Fixes featured hashtag setting page erroring out instead of rejecting invalid...ThibG
2019-09-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-09-19Add account migration UI (#11846)Eugen Rochko
2019-09-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-09-18Add password challenge to 2FA settings, e-mail notifications (#11878)Eugen Rochko
2019-09-18Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)Eugen Rochko
2019-08-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-30Fix uncaught parameter missing exceptions and missing error templates (#11702)Eugen Rochko
2019-08-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-06Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)Yusuke Nakamura
2019-07-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-22Change unconfirmed user login behaviour (#11375)Eugen Rochko
2019-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-07Change /settings/preferences to redirect to appearance, add /settings/prefere...Eugen Rochko
2019-06-07Change preferences page into appearance, notifications, and other (#10977)Eugen Rochko
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10compare usernames case-insensitively on new proof creation flow (#10544)Alex Gessner
2019-04-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-08Export and import show_reblogs together with following list (#10495)ThibG