You cannot 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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
accounts	Add exclude_reblogs option to account statuses API (#9640)	6 years ago
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	8 years ago
instances	Represent numbers by strings in instance activity API (#6198)	7 years ago
lists	Extract counters from accounts table to account_stats table (#9295)	6 years ago
push	Fix 404 for GET /api/v1/push/subscription (#7472)	7 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	Allow joining several hashtags in a single column (#8904)	7 years ago
accounts_controller.rb	Add REST API for creating an account (#9572)	6 years ago
apps_controller.rb	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	8 years ago
blocks_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
bookmarks_controller.rb	Introduce OAuth scopes for bookmarks	7 years ago
conversations_controller.rb	Add unread indicator to conversations (#9009)	7 years ago
custom_emojis_controller.rb	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	8 years ago
domain_blocks_controller.rb	Add more granular OAuth scopes (#7929)	7 years ago
endorsements_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
favourites_controller.rb	Support min_id-based pagination in REST API (#8736)	7 years ago
filters_controller.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	7 years ago
follow_requests_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
follows_controller.rb	Add more granular OAuth scopes (#7929)	7 years ago
instances_controller.rb	Cache instance info (#8765)	7 years ago
lists_controller.rb	Add backend support to read and update list-specific show_replies settings	6 years ago
media_controller.rb	Add more granular OAuth scopes (#7929)	7 years ago
mutes_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
reports_controller.rb	Add unread indicator to conversations (#9009)	7 years ago
search_controller.rb	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
statuses_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	7 years ago
streaming_controller.rb	Clean up for api/base controller (#3629)	8 years ago
suggestions_controller.rb	Add API method to remove a suggestion (#7978)	7 years ago