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 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c9. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.		6 years ago
..
accounts	Improve account media query (#10121)	6 years ago
apps	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
instances	…
lists	…
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	…
accounts_controller.rb	Add locale param to sign-up API (#9747)	6 years ago
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	Add cache to custom emojis API (#9732)	6 years ago
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
follows_controller.rb	…
instances_controller.rb	…
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	…
reports_controller.rb	…
scheduled_statuses_controller.rb	Add scheduled statuses (#9706)	6 years ago
search_controller.rb	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
statuses_controller.rb	Add scheduled statuses (#9706)	6 years ago
streaming_controller.rb	…
suggestions_controller.rb	…