Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		2021-01-06 18:08:06 +01:00
..
exports	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
migration	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +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	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
aliases_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
applications_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
deletes_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
exports_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
featured_tags_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02: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-09-28 14:13:30 +02:00
imports_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
migrations_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	2020-12-30 23:19:18 +01:00
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
profiles_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
sessions_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00