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 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		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	…
import	…
pubsubhubbub	Remove Salmon and PubSubHubbub (#11205)	6 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)	6 years ago
after_remote_follow_worker.rb	Remove Salmon and PubSubHubbub (#11205)	6 years ago
authorize_follow_worker.rb	…
backup_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	5 years ago
block_worker.rb	…
bootstrap_timeline_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	…
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	6 years ago
fetch_reply_worker.rb	…
import_worker.rb	…
link_crawl_worker.rb	…
local_notification_worker.rb	…
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)	6 years ago
poll_expiration_notify_worker.rb	…
post_process_media_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	5 years ago
processing_worker.rb	Remove Salmon and PubSubHubbub (#11205)	6 years ago
publish_announcement_reaction_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	5 years ago
publish_scheduled_announcement_worker.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	5 years ago
publish_scheduled_status_worker.rb	…
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)	6 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)	6 years ago
thread_resolve_worker.rb	…
unfavourite_worker.rb	…
unfollow_follow_worker.rb	Fix various issues with account migration (#12301)	5 years ago
unmerge_worker.rb	…
unpublish_announcement_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	5 years ago
verify_account_links_worker.rb	…