UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/javascript/mastodon/features
History
Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
 		2021-07-13 17:57:15 +02:00
..
account Add joined date to profiles in web UI (#16169) 2021-05-07 14:33:19 +02:00
account_gallery Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
account_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02: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 2021-06-03 20:47:02 +02:00
direct_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
directory Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +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 follow recommendations UI in advanced layout (#16215) 2021-05-11 21:16:24 +02:00
follow_requests Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
followers Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
following Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
generic_not_found Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
getting_started Change custom emoji to be animated when hovering container (#15637) 2021-01-31 21:25:31 +01:00
hashtag_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02: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 Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
mutes Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
notifications Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +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 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 Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
ui Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
video Fix defaultProps of frameRate to string (#15493) 2021-01-05 20:00:42 +01:00