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 c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 years ago
..
about	Merge branch 'master' into glitch-soc/master	7 years ago
accounts	Drop glitch-style account bio fields	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	7 years ago
application	Redesign public profiles and toots (#8068)	6 years ago
auth	Redesign public profiles and toots (#8068)	6 years ago
authorize_follows	Redesign public profiles and toots (#8068)	6 years ago
errors	New error page graphic. Other error page improvements (#5099)	7 years ago
filters	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
follower_accounts	Redesign public profiles and toots (#8068)	6 years ago
following_accounts	Redesign public profiles and toots (#8068)	6 years ago
home	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
invites	Add autofollow option to invites (#7805)	7 years ago
kaminari	Pagination improvements (#1445)	8 years ago
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
notification_mailer	Display content warning in mail notification emails (#6832)	7 years ago
oauth	Oauth code in input form and add description message (#4986)	7 years ago
remote_follow	Redesign public profiles and toots (#8068)	6 years ago
remote_unfollows	Redesign public profiles and toots (#8068)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	Redesign public profiles and toots (#8068)	6 years ago
shares	Finalized theme loading and stuff	7 years ago
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	Merge branch 'master' into glitch-soc/merge	7 years ago
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	7 years ago
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	7 years ago