Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.		2020-09-08 16:26:47 +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	Adapt 2FA changes to glitch-soc's theming system	2020-08-30 17:26:18 +02:00
aliases_controller.rb
applications_controller.rb
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb	Changed tag most_used to recently_used (#14760)	2020-09-07 17:47:41 +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-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
pictures_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
preferences_controller.rb
profiles_controller.rb
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