Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
components	Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060)	2021-11-26 22:04:09 +01:00
containers	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
features	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
middleware	Fix 404 and 410 API errors being silently discarded in WebUI (#13279)	2020-03-28 17:59:45 +01:00
reducers	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
selectors	Fix unnecessary re-rendering of various components when typing in web UI (#15286)	2020-12-07 19:36:36 +01:00
service_worker	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
storage
store	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
utils	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
api.js	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
base_polyfills.js	Fix old browsers crashing because of missing finally polyfill in web UI (#13115)	2020-02-18 17:22:44 +01:00
blurhash.js	Fix not being able to open audio modal in web UI (#15283)	2020-12-07 04:29:37 +01:00
common.js	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)	2020-03-21 03:14:50 +01:00
compare_id.js
extra_polyfills.js	fix multiple space (#12655)	2019-12-19 07:39:08 +09:00
initial_state.js	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-30 00:42:52 +02:00
is_mobile.js	Fix pop-out player appearing on mobile screens in web UI (#15157)	2020-11-16 05:16:39 +01:00
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	2019-11-04 13:03:09 +01:00
load_polyfills.js	Fix old browsers crashing because of missing finally polyfill in web UI (#13115)	2020-02-18 17:22:44 +01:00
main.js	Fix browser notification permission request logic (#13543)	2020-10-13 00:37:21 +02:00
performance.js
ready.js
scroll.js
settings.js
stream.js	Fixed ESLint error (#15214)	2020-11-23 17:35:14 +01:00
test_setup.js	Replace to testing-library from enzyme (#14152)	2020-06-29 13:58:07 +02:00
uuid.js