Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
admin	Add optional hCaptcha support	2022-01-24 21:22:13 +01:00
settings
accounts_helper.rb
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-26 22:32:21 +01:00
context_helper.rb	Compact JSON-LD signed incoming activities (#17426)	2022-02-03 14:07:29 +01:00
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	2019-11-21 11:35:39 +01:00
email_helper.rb	Add canonical e-mail blocks for suspended accounts (#16049)	2021-04-17 03:14:25 +02:00
flashes_helper.rb
home_helper.rb	Fix use of inline CSS in public pages (#13576)	2020-05-03 22:04:18 +02:00
instance_helper.rb
jsonld_helper.rb	Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)	2022-02-03 14:09:04 +01:00
languages_helper.rb	Change languages to be listed under standard instead of native name in admin UI (#17485)	2022-02-09 04:15:38 +01:00
mascot_helper.rb	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
routing_helper.rb
settings_helper.rb	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01:00
statuses_helper.rb
webfinger_helper.rb