Glitch-Shrike/app/javascript/mastodon
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
2023-07-12 15:27:32 +02:00
..
actions Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
components Fix dropdowns being disabled for logged out users in web UI (#25714) 2023-07-08 20:00:52 +02:00
containers Fix `/share` and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
features Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
locales Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
polyfills Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
reducers Remove unused `missed_update` state (#25832) 2023-07-08 20:02:14 +02:00
selectors Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
service_worker Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
store
utils Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172) 2023-05-31 09:27:21 +02:00
api.js
blurhash.ts
common.js
compare_id.ts
initial_state.js Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
is_mobile.ts
load_keyboard_extensions.js
main.jsx
performance.js
permissions.ts
ready.js
scroll.ts
settings.js
stream.js
test_setup.js
uuid.ts