AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/javascript/mastodon/features
History
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
account Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
account_gallery Add aliases for WebUI routes that were renamed in #16171 (#16772) 2021-09-27 07:23:48 +02:00
account_timeline Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
audio Add hotkeys for audio/video control (#15158) 2020-11-15 14:24:54 +01:00
blocks Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
bookmarked_statuses Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
community_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
compose Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
direct_timeline Fix incorrect use of old WebUI paths (#16773) 2021-09-27 07:24:04 +02:00
directory Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
domain_blocks Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
emoji Update emoji codepoint mappings to v13.1 (#16352) 2021-06-03 16:08:07 +02:00
favourited_statuses Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
favourites Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
follow_recommendations Fix incorrect use of old WebUI paths (#16773) 2021-09-27 07:24:04 +02:00
follow_requests Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
followers Add aliases for WebUI routes that were renamed in #16171 (#16772) 2021-09-27 07:23:48 +02:00
following Add aliases for WebUI routes that were renamed in #16171 (#16772) 2021-09-27 07:23:48 +02:00
generic_not_found Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
getting_started Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
hashtag_timeline Fix tag rendering error in hashtag column settings (#17184) 2021-12-26 19:22:05 +01:00
home_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
introduction Add option to disable swiping motions across the WebUI (#13885) 2020-09-30 19:31:03 +02:00
keyboard_shortcuts Add hotkey for toggling content warning composer field (#13987) 2020-06-09 10:32:32 +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 Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
lists Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
mutes Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
notifications Add notifications when a reblogged status has been updated (#17404) 2022-02-11 22:20:19 +01:00
picture_in_picture Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
pinned_statuses Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
public_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
reblogs Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
report Add blurhash (#10630) 2019-04-27 03:24:09 +02:00
search Add responsive panels to the single-column layout (#10820) 2019-05-25 21:27:00 +02:00
standalone Add local only to hashtag timeline (#13502) 2020-04-18 21:52:39 +02:00
status Chore: Disable menu items for editing statuses in web UI (#17497) 2022-02-10 15:28:53 +01:00
ui Add edit history to web UI (#17390) 2022-02-09 01:17:07 +01:00
video Fix defaultProps of frameRate to string (#15493) 2021-01-05 20:00:42 +01:00