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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
accounts	Support min_id-based pagination in REST API (#8736)	6 years ago
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
instances	Represent numbers by strings in instance activity API (#6198)	6 years ago
lists	Fix low-hanging rubocop gripes (#8458)	6 years ago
push	Fix 404 for GET /api/v1/push/subscription (#7472)	6 years ago
statuses	Introduce OAuth scopes for bookmarks	6 years ago
timelines	Support min_id-based pagination in REST API (#8736)	6 years ago
accounts_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
apps_controller.rb	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
blocks_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
bookmarks_controller.rb	Introduce OAuth scopes for bookmarks	6 years ago
custom_emojis_controller.rb	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
domain_blocks_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
endorsements_controller.rb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	6 years ago
favourites_controller.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
filters_controller.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
follow_requests_controller.rb	Self-notify on accepting follow requests (#8541)	6 years ago
follows_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
instances_controller.rb	Cache instance info (#8765)	6 years ago
lists_controller.rb	Fix low-hanging rubocop gripes (#8458)	6 years ago
media_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
mutes_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
reports_controller.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
search_controller.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
statuses_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	6 years ago
streaming_controller.rb	Clean up for api/base controller (#3629)	7 years ago
suggestions_controller.rb	Add API method to remove a suggestion (#7978)	6 years ago