AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/javascript/mastodon/features
History
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +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-26 09:29:23 +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 Fix various typos (#17621) 2022-02-22 20:14:17 +01:00
explore Add explore page to web UI (#17123) 2022-02-25 00:34:33 +01: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 explore page to web UI (#17123) 2022-02-25 00:34:33 +01: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 for new sign-ups (#16953) 2022-02-23 16:45:22 +01:00
picture_in_picture Fix media modal footer's “external link” not being a link (#17561) 2022-02-25 01:20:41 +01: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 Change report modal to include category selection in web UI (#17565) 2022-02-23 20:03:46 +01: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 Fix reply button on media modal not giving focus to compose form (#17626) 2022-02-25 00:51:01 +01:00
video Fix defaultProps of frameRate to string (#15493) 2021-01-05 20:00:42 +01:00