monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Claire c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
 		2024-12-02 21:08:15 +01:00
..
actions Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 2024-12-01 18:22:00 +01:00
api Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
api_types Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
components Fix middle-click handling conflicting with automatic scrolling (#33106) 2024-11-29 14:04:22 +00:00
containers Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
features Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 2024-12-02 21:08:15 +01:00
locales Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 2024-12-02 21:08:15 +01:00
models Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
polyfills
…
reducers Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +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
…
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
…