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 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
account/components Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
account_gallery Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
account_timeline Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01: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-03-16 20:59:33 +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 Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
emoji fix: update to emoji-mart 2.10.0 (#10281) 2019-03-16 20:13:15 +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 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 Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Rename from instance to server. (#9938) 2019-02-05 19:11:24 +01: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 Fix scrollbar styles on compose textarea, small bugs (#10292) 2019-03-16 20:10:42 +01: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 missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
standalone Disable real-time updates on public pages to improve readability (#10260) 2019-03-18 18:34:56 +01:00
status Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
ui Show disappointed elephant if web UI crashes (#10275) 2019-03-15 05:35:45 +01:00
video Fix video player width not being updated to fit container width (#10069) 2019-02-18 00:10:21 +01:00