AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/javascript/mastodon/features
History
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
..
account Fix logo button style (#15428) 2020-12-26 23:50:34 +01: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 Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
bookmarked_statuses Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
community_timeline Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330) 2019-11-11 00:05:02 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
direct_timeline Freeze scroll position when a dropdown menu is open in the TL (#14271) 2020-07-09 15:09:19 +02:00
directory Replace shortNumberFormat with <ShortNumber> (#14061) 2020-07-06 14:27:32 +02:00
domain_blocks Change the string "hidden" to "blocked" in WebUI (#13221) 2020-03-09 09:13:21 +01:00
emoji Change how CDN_HOST is passed down to make assets build reproducible (#14381) 2020-10-13 01:19:35 +02:00
favourited_statuses Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
favourites Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
follow_requests Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
followers Fix the conditions for incomplete remote content (#14195) 2020-07-01 23:38:44 +02:00
following Fix the conditions for incomplete remote content (#14195) 2020-07-01 23:38:44 +02:00
generic_not_found Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
getting_started Mark correctly as read reverse-order announcements (#15070) 2020-11-19 17:40:18 +01:00
hashtag_timeline Fix hashtag column options styling (#14247) 2020-07-07 01:33:38 +02:00
home_timeline Change how unread announcements are handled (#13020) 2020-02-03 01:53:09 +01: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 Fix missing key in list timeline policy (#15494) 2021-01-05 19:57:50 +01:00
lists Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
mutes Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
notifications Change notification permission handling (#15176) 2020-12-15 18:43:54 +01:00
picture_in_picture Change media modals look in web UI (#15217) 2020-11-27 03:24:11 +01:00
pinned_statuses Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
public_timeline Add remote only to public timeline (#13504) 2020-05-10 10:36:18 +02:00
reblogs Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01: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 Fix missing pictureInPicture prop in detailed status container (#15309) 2020-12-09 04:33:33 +01:00
ui Fix expand video on public page (#15469) 2020-12-30 23:18:11 +01:00
video Fix defaultProps of frameRate to string (#15493) 2021-01-05 20:00:42 +01:00