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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
accounts	Improve blocked view of profiles (#10491)	6 years ago
admin	Add moderation API (#9387)	6 years ago
apps	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
instances	Add (back) rails-level JSON caching (#11333)	5 years ago
lists	Extract counters from accounts table to account_stats table (#9295)	6 years ago
polls	Add polls (#10111)	6 years ago
push	Fix web push notifications for polls (#10864)	6 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	5 years ago
accounts_controller.rb	Improve blocked view of profiles (#10491)	6 years ago
apps_controller.rb	…
blocks_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
bookmarks_controller.rb	…
conversations_controller.rb	Add unread indicator to conversations (#9009)	6 years ago
custom_emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	5 years ago
domain_blocks_controller.rb	…
endorsements_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
favourites_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
instances_controller.rb	Add (back) rails-level JSON caching (#11333)	5 years ago
lists_controller.rb	Add backend support to read and update list-specific show_replies settings	6 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	Add a preferences API so apps can share basic behaviours (#10109)	6 years ago
reports_controller.rb	Add unread indicator to conversations (#9009)	6 years ago
scheduled_statuses_controller.rb	Add scheduled statuses (#9706)	6 years ago
search_controller.rb	Add env variable to control search limit	5 years ago
statuses_controller.rb	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	5 years ago
streaming_controller.rb	…
suggestions_controller.rb	…