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.

David Yip c816701550 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml		7 years ago
..
accounts	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)	7 years ago
apps	…
instances	…
lists	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
statuses	Add backend support for bookmarks	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	…
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	…
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	Paginate descendant statuses in public page (#7148)	7 years ago
streaming_controller.rb	…