Glitch-Shrike/app/javascript/mastodon/features
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
..
account/components Improve account bar css (#8087) 2018-07-28 20:09:58 +02:00
account_gallery Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
account_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
blocks Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
community_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
compose
direct_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
domain_blocks Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
emoji
favourited_statuses Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
favourites Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
follow_requests Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
followers Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
following Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
generic_not_found
getting_started
hashtag_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
home_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
keyboard_shortcuts Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
list_editor
list_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
lists
mutes Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
notifications
pinned_statuses Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
public_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
reblogs Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
report
standalone
status Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
trends
ui Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
video