119 Commits (49eaf72faf5b8b6f574a759a990c230f82c3b891)

Author SHA1 Message Date
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 075e162319
Whitelist report notification param in Settings::NotificationsController (#8560)
6 years ago
Eugen Rochko c593d6df9c
Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Thibaut Girka 402da8065c Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a58ec29631
Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
6 years ago
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko 10f51c9886
Fix domain hiding logic (#7765)
6 years ago
David Yip 97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454.
6 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 36e47a31e3
Enforce order on authorized applications page (#7587)
6 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
6 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
6 years ago
Jenkins 2636a23092 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko 7293b9fc61
Ensure unfilled fields are shown when errors are shown (#7523)
6 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
6 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
6 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
6 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
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