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
..
accounts	Add preference to hide following/followers lists (#7532)	7 years ago
apps	…
instances	Represent numbers by strings in instance activity API (#6198)	7 years ago
lists	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
push	Fix 404 for GET /api/v1/push/subscription (#7472)	7 years ago
statuses	Merge branch 'master' into glitch-soc/master	7 years ago
timelines	Direct messages column (#4514)	7 years ago
accounts_controller.rb	Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)	7 years ago
apps_controller.rb	…
blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
bookmarks_controller.rb	Add backend support for bookmarks	7 years ago
custom_emojis_controller.rb	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
domain_blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
favourites_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
follow_requests_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
follows_controller.rb	…
instances_controller.rb	…
lists_controller.rb	Limit users to 50 lists, remove pagination from lists API (#5933)	7 years ago
media_controller.rb	Focal points (#6520)	7 years ago
mutes_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
notifications_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
reports_controller.rb	Federated reports (#6570)	7 years ago
search_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
statuses_controller.rb	Remove small pagination limit from context API (#7564)	7 years ago
streaming_controller.rb	…