mastodon/app/javascript/mastodon
Claire ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
..
actions Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 2025-01-14 20:38:32 +01:00
api Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
api_types Redirect new users to onboarding (#33471) 2025-01-14 13:10:48 +00:00
components Require specific subtype of `formatMessage` in `timeAgoString` (#33511) 2025-01-08 16:26:54 +00:00
containers Fix `/share` not using server-set characters limit (#33459) 2025-01-06 08:14:11 +00:00
features Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 2025-01-14 20:38:32 +01:00
locales Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 2025-01-14 20:38:32 +01:00
models Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
polyfills
reducers Remove old notifications actions and reducers (#31843) 2025-01-03 16:12:08 +00:00
selectors Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
service_worker
store
utils
api.ts Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
blurhash.ts
common.js
compare_id.ts
identity_context.tsx
initial_state.js Localize language names (#33402) 2025-01-03 15:29:25 +00:00
is_mobile.ts
load_keyboard_extensions.js
main.jsx
performance.js
permissions.ts Add link from Web UI for Hashtags to the Moderation UI (#31448) 2024-11-29 07:36:17 +00:00
ready.js
scroll.ts
settings.js
stream.js
test_helpers.tsx
test_setup.js
uuid.ts