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 a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.		7 years ago
..
activitypub	Better pagination for ActivityPub outbox (#7356)	7 years ago
admin	Merge branch 'master' into glitch-soc/master	7 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
auth	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
concerns	HTTP signatures spec no longer requires algorithms field (#7525)	7 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
well_known	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)	7 years ago
about_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
authorize_follows_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
emojis_controller.rb	Cache JSON of immutable ActivityPub representations (#6171)	7 years ago
follower_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
following_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
home_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
intents_controller.rb	…
invites_controller.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
manifests_controller.rb	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
media_controller.rb	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
media_proxy_controller.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	7 years ago
remote_follow_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
remote_unfollows.rb	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	7 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
statuses_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
stream_entries_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
tags_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago