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 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		5 years ago
..
activitypub	Fix multiple issues with replies collection for pages further than self-replies (#11582)	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
concerns	Add HTTP signature keyId to request log (#11591)	5 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Add option to disable emoji replacements	5 years ago
well_known	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
about_controller.rb	Use public pack in about controller to handle blockpage JS	5 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
custom_css_controller.rb	Fix custom CSS controller (#11336)	5 years ago
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	5 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
instance_actors_controller.rb	Fix reverse-proxy caching of instance actor object (#11561)	5 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifests_controller.rb	Bump active_model_serializers from 0.10.9 to 0.10.10 (#11311)	5 years ago
media_controller.rb	Add whitelist mode (#11291)	5 years ago
media_proxy_controller.rb	Fix uncaught 422 and 500 errors (#11590)	5 years ago
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago