AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/javascript/mastodon/features
History
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
account/components Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
account_gallery Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
account_timeline Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
blocks Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01: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 2019-05-23 19:01:30 +02:00
direct_timeline When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
domain_blocks Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
emoji Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 2019-03-30 01:41:35 +01: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 Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
followers Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
following Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Add forceSingleColumn prop to <UI /> (#10807) 2019-05-23 01:35:22 +02:00
hashtag_timeline Fix hashtag column not subscribing to stream on mount (#10040) 2019-02-14 15:46:42 +01:00
home_timeline Fix home timeline perpetually reloading when empty (#10130) 2019-03-01 11:11:35 +01:00
introduction change "finish tutorial" text to "finish toot-orial" (#9905) 2019-02-04 04:45:29 +01:00
keyboard_shortcuts Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_adder Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
list_editor Add list title editing (#9748) 2019-02-13 18:52:02 +01:00
list_timeline Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
lists Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
mutes Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
notifications When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
public_timeline Rename from instance to server. (#9938) 2019-02-05 19:11:24 +01:00
reblogs Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
report Add blurhash (#10630) 2019-04-27 03:24:09 +02:00
standalone Disable real-time updates on public pages to improve readability (#10260) 2019-03-18 18:34:56 +01:00
status Change poll options to alphabetic letters when status text is hidden (#10685) 2019-05-18 14:41:16 +02:00
ui Add forceSingleColumn prop to <UI /> (#10807) 2019-05-23 01:35:22 +02:00
video Add button to view context to media modal (#10676) 2019-05-03 16:16:30 +02:00