djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/mastodon/features
History
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 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-11 17:57:08 +02:00
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 Fix issues with updated emoji mart (#7761) 2018-06-08 13:28:04 +02:00
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 Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Display Mastodon version in footer of web UI (#8013) 2018-07-14 03:56:34 +02:00
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 Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
list_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
lists Change list icons different from the getting-started icons (#7838) 2018-06-18 15:33:11 +02:00
mutes Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
notifications Fix filters not affecting notifications in web UI (#7977) 2018-07-07 19:31:19 +02:00
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 Show media on report UI (#6619) 2018-03-04 20:29:12 +01:00
standalone Allow clients to fetch statuses made while they were offline (#6876) 2018-03-24 15:25:15 +01:00
status Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
trends Improve trends layout (#7700) 2018-06-01 19:18:37 +02:00
ui Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
video Open video modal on public UI (#7469) 2018-05-13 13:48:14 +02:00