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 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
admin	Remove auto-silence behaviour from spam check (#12117)	5 years ago
concerns	Add announcements (#12662)	5 years ago
form	Merge branch 'master' into glitch-soc/master	5 years ago
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_alias.rb	…
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	Fix search by IP not using alternative browser sessions in admin UI (#12904)	5 years ago
account_identity_proof.rb	…
account_migration.rb	…
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	…
account_tag_stat.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
announcement.rb	Add announcements (#12662)	5 years ago
announcement_filter.rb	Add announcements (#12662)	5 years ago
announcement_mute.rb	Add announcements (#12662)	5 years ago
announcement_reaction.rb	Add announcements (#12662)	5 years ago
application_record.rb	…
backup.rb	Add announcements (#12662)	5 years ago
block.rb	…
bookmark.rb	Add announcements (#12662)	5 years ago
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	Add announcements (#12662)	5 years ago
custom_emoji_category.rb	…
custom_emoji_filter.rb	Various fixes and improvements (#12878)	5 years ago
custom_filter.rb	Add “account timeline” filter category (#12918)	5 years ago
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	Allow blocking TLDs, and fix TLD blocks not being editable (#12805)	5 years ago
email_domain_block.rb	…
export.rb	…
favourite.rb	…
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	Fix performance of home feed regeneration (#12084)	5 years ago
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	Various fixes and improvements (#12878)	5 years ago
invite.rb	…
invite_filter.rb	Various fixes and improvements (#12878)	5 years ago
list.rb	…
list_account.rb	Add abilityto add oneself to lists (#12271)	5 years ago
list_feed.rb	…
marker.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	…
mute.rb	…
notification.rb	Add follow_request notification type (#12198)	5 years ago
poll.rb	Only normalize local polls (#12515)	5 years ago
poll_vote.rb	…
preview_card.rb	…
relationship_filter.rb	Fix relationships page not showing results in admin UI (#12934)	5 years ago
relay.rb	…
remote_follow.rb	…
report.rb	…
report_filter.rb	Various fixes and improvements (#12878)	5 years ago
report_note.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
status_pin.rb	…
status_stat.rb	…
tag.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 years ago
tag_filter.rb	Various fixes and improvements (#12878)	5 years ago
tombstone.rb	…
trending_tags.rb	Fix admin setting to auto-approve hashtags not affecting query (#12130)	5 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
user_invite_request.rb	…
web.rb	…