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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
admin	Remove auto-silence behaviour from spam check (#12117)	5 years ago
concerns	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
form	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	Validate Web::PushSubscription (#11971)	5 years ago
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_alias.rb	Addition of update activity distribution by alias, minor correction (#11905)	5 years ago
account_conversation.rb	…
account_domain_block.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
account_filter.rb	…
account_identity_proof.rb	…
account_migration.rb	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	Fix account counters being overwritten by parallel writes (#12045)	5 years ago
account_tag_stat.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
application_record.rb	Fix records not being indexed sometimes (#12024)	5 years ago
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	Revert "Remove conversation URI (#11423)" (#11424)	5 years ago
conversation_mute.rb	…
custom_emoji.rb	Fix audit log error when custom emoji is copied from remote server (#11876)	5 years ago
custom_emoji_category.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	5 years ago
custom_emoji_filter.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	5 years ago
custom_filter.rb	…
direct_feed.rb	…
domain_allow.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
domain_block.rb	Add table of contents to about page (#11885)	5 years ago
email_domain_block.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
export.rb	…
favourite.rb	Fix records not being indexed sometimes (#12024)	5 years ago
featured_tag.rb	Fix featured tags not finding the right tag on save (#11504)	5 years ago
feed.rb	Fix non-numbers being passed to Redis and causing an error (#11697)	5 years ago
follow.rb	…
follow_request.rb	…
home_feed.rb	Fix performance of home feed regeneration (#12084)	5 years ago
identity.rb	…
import.rb	…
instance.rb	Add whitelist mode (#11291)	5 years ago
instance_filter.rb	Add whitelist mode (#11291)	5 years ago
invite.rb	Add invite comments (#10465)	5 years ago
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
marker.rb	Add timeline read markers API (#11762)	5 years ago
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mention.rb	…
mute.rb	…
notification.rb	…
poll.rb	Add voters count support (#11917)	5 years ago
poll_vote.rb	…
preview_card.rb	Fix preview card image not being re-fetched even if link is re-posted (#11981)	5 years ago
relay.rb	Fix relays UI being available in whitelist/secure mode (#11963)	5 years ago
remote_follow.rb	Add account migration UI (#11846)	5 years ago
report.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
report_filter.rb	…
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	Fix admin setting to auto-approve hashtags not affecting query (#12130)	5 years ago
tag_filter.rb	Add search and sort functions to hashtag admin UI (#11829)	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	…