nyastodon/app/javascript/mastodon/features
Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
2018-10-29 14:00:41 +01:00
..
account/components Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
account_gallery Add a new preference to always hide all media (#8569) 2018-09-25 05:09:35 +02:00
account_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
community_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
direct_timeline Fix direct messages column not loading more items on scroll (#9102) 2018-10-26 01:55:08 +02:00
domain_blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
emoji When searching for an emoji with multiple separators, consider the full input (#9124) 2018-10-27 22:32:54 +02:00
favourited_statuses Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
favourites Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
follow_requests Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
followers Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
following Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Change documentation URL (#8898) 2018-10-06 14:33:36 +09:00
hashtag_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
home_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
keyboard_shortcuts Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_editor Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
list_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
lists Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
mutes Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
notifications Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
public_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
reblogs Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
report Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
standalone Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
status Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133) 2018-10-29 04:42:07 +01:00
ui Handle global hotkeys even when no element has focus (#8998) 2018-10-17 16:56:16 +02:00
video Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00