about summary refs log tree commit diff
path: root/spec/controllers/settings
AgeCommit message (Expand)Author
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
2019-04-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-03Export and import `hide_notifications` alongside user mutes (#10335)ThibG
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-28squashed identity proof updates (#10375)Alex Gessner
2019-03-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-18Add Keybase integration (#10297)Eugen Rochko
2019-03-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-16Add relationship manager UI (#10268)Eugen Rochko
2018-12-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-14Error message for avatar image that's too large. #9204 (#9518)Sumit Khanna
2018-12-13Add spec for Settings::ExportsController#create (#9512)ysksn
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-04lint pass 2 (#8878)aus-social
2018-10-04Lint pass (#8876)aus-social
2018-07-09Migrate glitch-soc keyword mutes to Mastodon'sThibaut Girka
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-17Change language opt-out to language opt-in (#7823)Eugen Rochko
2018-06-07Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2018-06-06Add missing tests for sessions controller (#7744)Shuhei Kitagawa
2018-06-02Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-06-02Add tests for migrations_controller (#7707)Shuhei Kitagawa
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip