nyastodon/app/views/settings
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
..
applications Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
deletes Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
exports Add hint about 7 day cooldown for archive takeout (#7375) 2018-05-06 10:53:10 +02:00
flavours Don't show skins selector when there's only one (#256) 2018-01-08 16:45:32 -08:00
follower_domains Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
imports Optimize user setting page for mobile browser (#1924) 2017-04-17 10:37:00 +02:00
keyword_mutes Add apply-to-mentions option to keyword mute UI. #454. 2018-06-04 02:51:28 -05:00
migrations Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
notifications Add option to block direct messages from people you don't follow (#5669) 2017-11-14 21:12:57 +01:00
preferences Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
shared 2FA controller cleanup (#2296) 2017-04-22 04:23:17 +02:00
two_factor_authentication Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
two_factor_authentications Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00