You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		1 year ago
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
applications	Setup haml-lint CI with todo config (#23524)	2 years ago
deletes	Fix style for hashes (#20518)	2 years ago
exports	Change user backups to use expiring URLs for download when possible (#24136)	2 years ago
featured_tags	Change edit profile page (#25413)	1 year ago
flavours	Fix glitch-soc HAML linting issues (#2166)	1 year ago
imports	Add support for importing lists (#25203)	1 year ago
login_activities	Fix typo in _login_activity.html.haml (#24263)	2 years ago
migration/redirects	Fix style for hashes (#20518)	2 years ago
migrations	Fix style for hashes (#20518)	2 years ago
preferences	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream	1 year ago
profiles	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
shared	Change edit profile page (#25413)	1 year ago
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
verifications	Change edit profile page (#25413)	1 year ago