Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.		2020-09-08 16:26:47 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-19 19:16:41 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
admin_mailer	Fixed not being able to display review pending hashtags in the admin UI. (#11875)	2019-09-17 16:59:16 +02:00
application	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
auth	Adapt 2FA changes to glitch-soc's theming system	2020-08-30 17:26:18 +02:00
authorize_interactions	Fix misleading error when attempting to re-send a pending follow request (#13133)	2020-02-24 21:19:19 +01:00
directories	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
errors	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
filters	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
follower_accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
following_accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
home	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
invites	Remove invite comments from UI (#12068)	2019-10-03 22:37:13 +02:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
media	Fix embedded player	2020-08-12 00:00:42 +02:00
notification_mailer	Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)	2019-09-05 06:14:30 +02:00
oauth	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01:00
remote_follow	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
remote_interaction	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
shared	Remove fallback to long description on sidebar and meta description (#12119)	2019-10-08 22:08:55 +02:00
shares	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-13 22:17:29 +02:00
tags	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-20 16:45:40 +02:00
user_mailer	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
well_known/host_meta	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	2019-08-01 19:14:02 +02:00