Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +02:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
admin	Fix admin API unconditionally requiring CSRF token (#17975)	2022-04-06 20:57:18 +02:00
announcements
apps
crypto
emails	Fix POST /api/v1/emails/confirmations not being available after sign-up (#17743)	2022-03-12 04:14:25 +01:00
featured_tags
instances
lists
polls
push
statuses	Add edit history to web UI (#17390)	2022-02-09 01:17:07 +01:00
timelines
trends	Fix GET /api/v1/trends/tags missing offset param in REST API (#17973)	2022-04-06 20:56:57 +02:00
accounts_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
announcements_controller.rb
apps_controller.rb
blocks_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
endorsements_controller.rb
favourites_controller.rb
featured_tags_controller.rb
filters_controller.rb
follow_requests_controller.rb	Fix duplicate notifications being possible after poll expiration (#17697)	2022-03-04 01:06:33 +01:00
instances_controller.rb
lists_controller.rb
markers_controller.rb
media_controller.rb	Allow editing media attachments for scheduled toots (#17690)	2022-03-03 16:13:58 +01:00
mutes_controller.rb	Change follow scope to be covered by read and write scopes in REST API (#17678)	2022-03-03 16:13:40 +01:00
notifications_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
polls_controller.rb
preferences_controller.rb
reports_controller.rb	Fix report category not being saved in REST API (#17682)	2022-03-02 18:57:08 +01:00
scheduled_statuses_controller.rb
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-10 09:52:45 +01:00
streaming_controller.rb
suggestions_controller.rb