4 Commits (e5a603206dfa76e2cd1b8a7fbb940fbd844b436c)

Author	SHA1	Message	Date
Thibaut Girka	c700778922	Scroll to linked status in public status view	2018-08-07 16:58:00 +02:00
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
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
kibigo!	a9ed857171	WIP static themeing	2017-11-18 15:12:52 -08:00