mastodon

Author	SHA1	Message	Date
Claire	48722a3188	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.	2020-12-19 00:55:12 +01:00
Eugen Rochko	816df80b86	Add option to obfuscate domain name in public list of domain blocks (#15355 ) - Replace the middle of the domain with * characters (except for periods) - Add SHA-256 digest of the domain name in tooltip	2020-12-18 08:30:41 +01:00
Eugen Rochko	79f71206de	Add subresource integrity for JS and CSS assets (#15096 ) Fix #2744	2020-11-06 11:56:31 +01:00
Thibaut Girka	68f5e8b9f8	Fix domain block edition in glitch-soc	2019-08-08 09:14:20 +02:00
ThibG	072e696aa1	Add domain block notes (#11515 ) * 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	2019-08-07 20:20:23 +02:00