Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.

2022-11-12 13:28:03 +01:00

..

about

Fix WebUI crash when listing server blocks and rationale is not available (#20408)

2022-11-11 21:23:03 +01:00

account

Add option to open original page in dropdowns of remote content in web UI (#20299)

2022-11-10 08:49:35 +01:00

account_gallery

Fix media, following and followers tabs in web UI (#19426)

2022-10-23 23:38:08 +02:00

account_timeline

Add option to open original page in dropdowns of remote content in web UI (#20299)

2022-11-10 08:49:35 +01:00

audio

Add warning for sensitive audio posts (#17885)

2022-08-13 15:39:05 +02:00

blocks

Fix block/mute lists showing a follow button when unblocking a user (#18364)

2022-05-09 23:20:19 +02:00

bookmarked_statuses

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

closed_registrations_modal

Fix closed registrations message not appearing in web UI (#19508)

2022-10-28 19:34:22 +02:00

community_timeline

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

compose

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-12 13:28:03 +01:00

direct_timeline

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

directory

Fix being unable to withdraw follow request when confirmation modal is disabled (#19687)

2022-11-03 16:05:39 +01:00

domain_blocks

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

emoji

Add assets from Twemoji 14.0 (#19733)

2022-11-04 16:08:41 +01:00

explore

Remove navigation links to /explore when trends are disabled (#19415)

2022-10-25 19:03:16 +02:00

favourited_statuses

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

favourites

Fix compose form submission reloading web interface (#19762)

2022-11-05 13:43:37 +01:00

filters

Fix compose form submission reloading web interface (#19762)

2022-11-05 13:43:37 +01:00

follow_recommendations

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

follow_requests

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

followers

Fix media, following and followers tabs in web UI (#19426)

2022-10-23 23:38:08 +02:00

following

Fix media, following and followers tabs in web UI (#19426)

2022-10-23 23:38:08 +02:00

generic_not_found

Fix performance of home feed regeneration (#12084)

2019-10-06 22:11:17 +02:00

getting_started

Remove navigation links to /explore when trends are disabled (#19415)

2022-10-25 19:03:16 +02:00

hashtag_timeline

Remove aria-pressed where it's redundant (#19912)

2022-11-08 17:31:32 +01:00

home_timeline

Remove aria-pressed where it's redundant (#19912)

2022-11-08 17:31:32 +01:00

interaction_modal

Fix confusing wording in interaction modal in web UI (#20302)

2022-11-10 08:49:48 +01:00

keyboard_shortcuts

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

list_adder

Refactor icons in web UI to use Icon component (#9951)

2019-02-01 00:14:05 +01:00

list_editor

Disable list title validation button when list title is empty (#11475)

2019-08-03 19:10:39 +02:00

list_timeline

Fix compose form submission reloading web interface (#19762)

2022-11-05 13:43:37 +01:00

lists

Change design of new list form in web UI (#19801)

2022-11-05 23:06:32 +01:00

mutes

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

notifications

Fix console log error on column settings load (#19886)

2022-11-07 03:39:48 +01:00

picture_in_picture

Remove aria-pressed where it's redundant (#19912)

2022-11-08 17:31:32 +01:00

pinned_statuses

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

privacy_policy

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

public_timeline

Change public accounts pages to mount the web UI (#19319)

2022-10-20 14:35:29 +02:00

reblogs

Fix compose form submission reloading web interface (#19762)

2022-11-05 13:43:37 +01:00

report

Fix missing rules in report modal in web UI (#19387)

2022-10-18 19:33:11 +02:00

standalone/compose

Remove code for rendering public and hashtag timelines outside the web UI (#19257)

2022-10-04 20:13:46 +02:00

status

Add option to open original page in dropdowns of remote content in web UI (#20299)

2022-11-10 08:49:35 +01:00

subscribed_languages_modal

Fix “Change subscribed languages” crashing in some situations (#19268)

2022-10-03 02:56:12 +02:00

ui

Do not show drag&drop dialog when not logined (#20400)

2022-11-11 21:19:48 +01:00

video

Replace deprecated String.prototype.substr() (#17949)

2022-04-04 12:19:45 -04:00