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
..
activitypub	Add voters count support (#11917)	5 years ago
concerns	Add whitelist mode (#11291)	5 years ago
account_search_service.rb	Fix search error when ElasticSearch is enabled but not available (#11954)	5 years ago
after_block_domain_from_account_service.rb	Change account domain block to clear out notifications and follows (#11393)	5 years ago
after_block_service.rb	Change account domain block to clear out notifications and follows (#11393)	5 years ago
app_sign_up_service.rb	Add `reason` param to `POST /api/v1/accounts` REST API (#12064)	5 years ago
authorize_follow_service.rb	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
block_domain_service.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
block_service.rb	…
bootstrap_timeline_service.rb	Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid (#12037)	5 years ago
fan_out_on_write_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
favourite_service.rb	…
fetch_link_card_service.rb	Remove HEAD request from fetching link previews (#12028)	5 years ago
fetch_oembed_service.rb	…
fetch_remote_account_service.rb	…
fetch_remote_status_service.rb	…
fetch_resource_service.rb	…
follow_service.rb	Change silences to always require approval on follow (#11975)	5 years ago
hashtag_query_service.rb	Fix hashtag timeline REST API accepting too many hashtags (#12091)	5 years ago
import_service.rb	…
move_service.rb	Fix account migration not affecting followers on origin server (#11980)	5 years ago
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
precompute_feed_service.rb	…
process_hashtags_service.rb	Change hashtags to preserve first-used casing (#11416)	5 years ago
process_mentions_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
reblog_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
reject_follow_service.rb	…
remove_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
report_service.rb	…
resolve_account_service.rb	Fix acct URIs with IDN domains not being resolved (#11520)	5 years ago
resolve_url_service.rb	…
search_service.rb	Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977)	5 years ago
suspend_account_service.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
tag_search_service.rb	Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977)	5 years ago
unallow_domain_service.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
unblock_domain_service.rb	Add domain block notes (#11515)	5 years ago
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	Fix Move handler queuing jobs that will fail if account is suspended (#11864)	5 years ago
unmute_service.rb	…
update_account_service.rb	Fix follow requests N+1 (#12004)	5 years ago
verify_link_service.rb	…
vote_service.rb	Add voters count support (#11917)	5 years ago