mastodon/app/javascript/mastodon
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
components Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
containers Spelling (#17705) 2022-03-06 22:51:40 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
middleware
reducers Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
selectors Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
service_worker Add notifications for new sign-ups (#16953) 2022-02-23 16:45:22 +01:00
storage
store
utils Add support for webp uploads (#18506) 2022-05-27 20:06:40 +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
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js