mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2020-12-19	Merge branch 'master' into glitch-soc/merge-upstream	Claire
	Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
2020-12-18	Add option to obfuscate domain name in public list of domain blocks (#15355)	Eugen Rochko
	- Replace the middle of the domain with * characters (except for periods) - Add SHA-256 digest of the domain name in tooltip
2020-11-06	Add subresource integrity for JS and CSS assets (#15096)	Eugen Rochko
	Fix #2744
2019-08-08	Fix domain block edition in glitch-soc	Thibaut Girka

2019-08-07	Add domain block notes (#11515)	ThibG
	* Add database columns for adding notes to domain blocks/restrctions * Add admin UI to set private and public comments when blocking a domain * Add text for private and public comments on domain blocks * Show domain block comments in admin UI * Add comments to the domain block undo page * Make UnblockDomainService more robust regarding upgraded domain blocks * Allow editing domain blocks * Rename button from “undo domain block” to “view domain block” in account admin UI * Change test to unsilence silenced users from upgraded blocks