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 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		5 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
concerns	Improved remote thread fetching (#10106)	6 years ago
import	Export and import show_reblogs together with following list (#10495)	6 years ago
pubsubhubbub	Remove Salmon and PubSubHubbub (#11205)	5 years ago
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	Fix web push subscriptions being deleted on rate limit or timeout (#11826)	5 years ago
after_account_domain_block_worker.rb	…
after_remote_follow_request_worker.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
after_remote_follow_worker.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
authorize_follow_worker.rb	…
backup_worker.rb	…
block_worker.rb	…
bootstrap_timeline_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	Avoid race condition when streaming deleted statuses (#10280)	6 years ago
domain_block_worker.rb	Add domain block notes (#11515)	5 years ago
feed_insert_worker.rb	Use a redis-cached feed for the DM timeline	5 years ago
fetch_reply_worker.rb	Improved remote thread fetching (#10106)	6 years ago
import_worker.rb	Add option to overwrite imported data (#9962)	6 years ago
link_crawl_worker.rb	…
local_notification_worker.rb	Optimize the process of following someone (#9220)	6 years ago
merge_worker.rb	…
move_worker.rb	Fix various issues with account migration (#12301)	5 years ago
mute_worker.rb	…
notification_worker.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
poll_expiration_notify_worker.rb	Fix wrong method used in PollExpirationNotifyWorker (#10265)	6 years ago
processing_worker.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
publish_scheduled_status_worker.rb	Fix multiple workers for the same scheduled status being queueable (#9875)	6 years ago
push_conversation_worker.rb	…
push_update_worker.rb	…
redownload_media_worker.rb	Add retry for failed media downloads and `tootctl media refresh` (#11775)	5 years ago
refollow_worker.rb	Fix RefollowWorker not keeping show_reblogs setting (#12707)	5 years ago
regeneration_worker.rb	…
remote_profile_update_worker.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
removal_worker.rb	Add soft delete for statuses for instant deletes through API (#11623)	5 years ago
resolve_account_worker.rb	…
salmon_worker.rb	Remove Salmon and PubSubHubbub (#11205)	5 years ago
thread_resolve_worker.rb	Improved remote thread fetching (#10106)	6 years ago
unfavourite_worker.rb	…
unfollow_follow_worker.rb	Fix various issues with account migration (#12301)	5 years ago
unmerge_worker.rb	…
verify_account_links_worker.rb	…