Glitch-Shrike/app/javascript/mastodon/features
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
account/components Make avatar and headers respect `auto_play_gif` (#9515) 2018-12-14 20:34:18 +01:00
account_gallery Minor scrollable list fixes (#9551) 2018-12-17 17:02:59 +01:00
account_timeline Use local instead of global loading indicator for timelines, account timelines (#9224) 2018-11-08 21:35:06 +01:00
blocks
community_timeline
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
direct_timeline Fix direct messages column not loading more items on scroll (#9102) 2018-10-26 01:55:08 +02:00
domain_blocks
emoji When searching for an emoji with multiple separators, consider the full input (#9124) 2018-10-27 22:32:54 +02:00
favourited_statuses
favourites
follow_requests
followers Various fixes to scrollable lists and media gallery (#9501) 2018-12-12 22:32:44 +01:00
following Various fixes to scrollable lists and media gallery (#9501) 2018-12-12 22:32:44 +01:00
generic_not_found
getting_started Remove links to bridge.joinmastodon.org (non-functional) (#9608) 2018-12-22 23:32:00 +01:00
hashtag_timeline Fix that translation is not applied to "joining hashtags" (#9397) 2018-11-30 19:36:09 +01:00
home_timeline
introduction Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
keyboard_shortcuts
list_adder Implement adding a user to a list from their profile (#9062) 2018-11-05 18:52:38 +01:00
list_editor
list_timeline
lists
mutes
notifications Add notification quick-filter bar in the frontend app (#9399) 2018-12-16 05:56:41 +01:00
pinned_statuses
public_timeline Clean up dead code in public timeline code (#9565) 2018-12-18 22:00:18 +01:00
reblogs
report
standalone Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
status Fix null error introduced in #9270 (#9275) 2018-11-12 22:07:31 +01:00
ui Sanitize and sandbox toot embeds (#9552) 2018-12-23 02:16:35 +01:00
video Volume sliders for videos #7429 (#9366) 2018-11-27 12:25:38 +01:00