me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Thibaut Girka d46668d34b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +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-26 15:41:40 +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 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 2019-03-27 14:04:58 +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 Improvements to the single column layout (#10835) 2019-05-26 02:55:37 +02: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 Fix wrong redirect from getting started to home in advanced Web UI (#10839) 2019-05-26 12:22:33 +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 Add a keyboard shortcut to hide/show media (#10647) 2019-05-25 23:20:51 +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 Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +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
search Add responsive panels to the single-column layout (#10820) 2019-05-25 21:27:00 +02:00
standalone Disable real-time updates on public pages to improve readability (#10260) 2019-03-18 18:34:56 +01:00
status Fix null error in status component when determining showMedia state (#10838) 2019-05-26 13:48:16 +02:00
ui Improvements to the single column layout (#10835) 2019-05-26 02:55:37 +02:00
video Add a keyboard shortcut to hide/show media (#10647) 2019-05-25 23:20:51 +02:00