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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
accounts	Improve status pin query (#11972)	5 years ago
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
apps	…
featured_tags	Add featured tags API (#11778)	5 years ago
instances	Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089)	5 years ago
lists	…
polls	…
push	Fix web push notifications for polls (#10864)	6 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
timelines	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
accounts_controller.rb	Add `reason` param to `POST /api/v1/accounts` REST API (#12064)	5 years ago
apps_controller.rb	Add whitelist mode (#11291)	5 years ago
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	Change unlisted custom emoji to not appear in autosuggestions (#11818)	5 years ago
directories_controller.rb	Add profile directory to web UI (#11688)	5 years ago
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	Add featured tags API (#11778)	5 years ago
filters_controller.rb	…
follow_requests_controller.rb	Add updated relationship to follow request API responses (#11800)	5 years ago
instances_controller.rb	Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089)	5 years ago
lists_controller.rb	…
markers_controller.rb	Add timeline read markers API (#11762)	5 years ago
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
polls_controller.rb	Fix poll API not requiring authentication on non-public polls (#10960)	6 years ago
preferences_controller.rb	…
reports_controller.rb	Add soft delete for statuses for instant deletes through API (#11623)	5 years ago
scheduled_statuses_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
streaming_controller.rb	Fix attachment not being re-downloaded even if file is not stored (#12125)	5 years ago
suggestions_controller.rb	…
trends_controller.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago