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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		5 years ago
..
accounts	make it not return http 400 when passing and empty source argument (#12259)	5 years ago
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
apps	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
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	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	Add bookmarks (#7107)	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	Extract counters from accounts table to account_stats table (#9295)	6 years ago
bookmarks_controller.rb	Support min_id-based pagination for bookmarks (#12381)	5 years ago
conversations_controller.rb	Add unread indicator to conversations (#9009)	6 years ago
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	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)	6 years ago
featured_tags_controller.rb	Add featured tags API (#11778)	5 years ago
filters_controller.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	7 years ago
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	Add backend support to read and update list-specific show_replies settings	6 years ago
markers_controller.rb	Add timeline read markers API (#11762)	5 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	6 years ago
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 soft delete for statuses for instant deletes through API (#11623)	5 years ago
scheduled_statuses_controller.rb	Add scheduled statuses (#9706)	6 years ago
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	Add API method to remove a suggestion (#7978)	7 years ago
trends_controller.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago