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.

Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		6 years ago
..
account_actions	Add moderation warnings (#9519)	6 years ago
account_moderation_notes	…
account_warnings	Add moderation warnings (#9519)	6 years ago
accounts	Improve admin UI for account view (#9643)	6 years ago
action_logs	…
change_emails	…
custom_emojis	…
dashboard	Add instance-wide setting to disable profile directory (#9497)	6 years ago
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
email_domain_blocks	…
followers	Fix admin UI view of local followers (#9712)	6 years ago
instances	Change "federation" admin UI link to point to "limited" domains (#9762)	6 years ago
invites	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Add admin setting to disable followers count	6 years ago
statuses	Add quick links to the admin interface in the WebUI (#8545)	6 years ago
subscriptions	…
tags	…
warning_presets	Add moderation warnings (#9519)	6 years ago