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 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.		6 years ago
..
accounts	Fix `tagged` param not being normalized before querying tags (#10249)	6 years ago
apps	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
instances	…
lists	Extract counters from accounts table to account_stats table (#9295)	6 years ago
polls	Add polls (#10111)	6 years ago
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	Fix `tagged` param not being normalized before querying tags (#10249)	6 years ago
accounts_controller.rb	Admission-based registrations mode (#10250)	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 cache to custom emojis API (#9732)	6 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
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	…
polls_controller.rb	Add polls (#10111)	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 type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
statuses_controller.rb	Add polls (#10111)	6 years ago
streaming_controller.rb	…
suggestions_controller.rb	…