Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 17:49:14 +02:00
components	Add rel="noopener" to links to remote profiles (#19014)	2022-08-26 02:12:46 +02:00
containers	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
features	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 17:49:14 +02:00
middleware
reducers	Fix “Filter this post” potentially listing deleted filters (#19051)	2022-08-25 17:36:35 +02:00
selectors	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
service_worker	Replace to workbox-webpack-plugin from offline-plugin (#18409)	2022-08-25 20:10:01 +02:00
store
utils	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +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
blurhash.js	Fix not being able to open audio modal in web UI (#15283)	2020-12-07 04:29:37 +01:00
common.js
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +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
load_polyfills.js
main.js	Replace to workbox-webpack-plugin from offline-plugin (#18409)	2022-08-25 20:10:01 +02:00
performance.js
permissions.js	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
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