Glitch-Shrike/app/javascript/mastodon/features
Claire d1780fb9a4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Removed upstream, while we had a checkbox telling people to check if the
  issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
..
account Add joined date to profiles in web UI (#16169) 2021-05-07 14:33:19 +02:00
account_gallery Change "Profile unavailable" string to "Account suspended" in web UI (#15345) 2020-12-14 09:08:09 +01:00
account_timeline Change "Profile unavailable" string to "Account suspended" in web UI (#15345) 2020-12-14 09:08:09 +01:00
audio Add hotkeys for audio/video control (#15158) 2020-11-15 14:24:54 +01:00
blocks
bookmarked_statuses
community_timeline
compose Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
direct_timeline Change custom emoji to be animated when hovering container (#15637) 2021-01-31 21:25:31 +01:00
directory Change custom emoji to be animated when hovering container (#15637) 2021-01-31 21:25:31 +01:00
domain_blocks
emoji Update emoji codepoint mappings to v13.1 (#16352) 2021-06-03 16:08:07 +02:00
favourited_statuses
favourites
follow_recommendations Fix follow recommendations UI in advanced layout (#16215) 2021-05-11 21:16:24 +02:00
follow_requests Add “translate” class to other user strings (#15611) 2021-01-22 10:09:23 +01:00
followers
following
generic_not_found
getting_started Change custom emoji to be animated when hovering container (#15637) 2021-01-31 21:25:31 +01:00
hashtag_timeline Bump react-select from 3.2.0 to 4.0.2 (#15624) 2021-03-22 15:41:47 +09:00
home_timeline Change home timeline to reload after follow recommendations in web UI (#16160) 2021-05-07 14:33:57 +02:00
introduction Add option to disable swiping motions across the WebUI (#13885) 2020-09-30 19:31:03 +02:00
keyboard_shortcuts
list_adder
list_editor
list_timeline Fix missing key in list timeline policy (#15494) 2021-01-05 19:57:50 +01:00
lists
mutes
notifications Fix eslint error (#16212) 2021-05-11 14:17:38 +02:00
picture_in_picture Add dropdown for boost privacy in boost confirmation modal (#15704) 2021-02-11 00:53:12 +01:00
pinned_statuses
public_timeline
reblogs
report
search
standalone
status Slightly reorder three dots menu on toots to make it more intuitive (#15647) 2021-02-11 01:05:04 +01:00
ui Fix #16407 (#16432) 2021-06-27 22:31:28 +02:00
video Fix defaultProps of frameRate to string (#15493) 2021-01-05 20:00:42 +01:00