Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +02:00
..
exports	Add CSV export for lists and domain blocks (#9677)	2019-01-01 13:44:04 +01:00
migration	Fix account redirect confirmation message talking about moved followers (#13950)	2020-06-03 20:18:19 +02:00
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00
two_factor_authentication	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
aliases_controller.rb	Addition of update activity distribution by alias, minor correction (#11905)	2019-09-21 09:11:21 +02:00
applications_controller.rb	Revert some refactoring in order to make codebase closer to upstream	2019-07-23 10:51:12 +02:00
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
deletes_controller.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	2019-09-15 21:08:39 +02:00
exports_controller.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
featured_tags_controller.rb	Fix pinned statuses being shown in a featured hashtag (#9971)	2019-02-05 00:27:18 +01:00
flavours_controller.rb	Revert some refactoring in order to make codebase closer to upstream	2019-07-23 10:51:12 +02:00
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
imports_controller.rb	Fix ImportsController param to permit :mode (#13347)	2020-03-31 12:43:42 +02:00
migrations_controller.rb	Fix account migration not affecting followers on origin server (#11980)	2019-09-29 16:23:13 +02:00
pictures_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
profiles_controller.rb	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
two_factor_authentication_methods_controller.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00