chuckya/app/javascript/mastodon/features
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
..
about Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
account Change design of dropdowns in web UI (#25107) 2023-06-06 21:49:49 +02:00
account_gallery Rewrite <LoadMore /> as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
account_timeline Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
audio Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
blocks Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
bookmarked_statuses Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
closed_registrations_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
community_timeline Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
compose Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
direct_timeline Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
directory Rewrite <LoadMore /> as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
domain_blocks Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
emoji Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
explore Rewrite <LoadMore /> as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
favourited_statuses Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
favourites Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
filters Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
follow_requests Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
followed_tags Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
followers Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
following Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
getting_started Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
hashtag_timeline Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
home_timeline Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
interaction_modal Fix null signUp URL in various places (#25190) 2023-05-30 19:01:42 +02:00
keyboard_shortcuts Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
list_adder Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
list_editor Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
list_timeline Add exclusive lists (#22048) 2023-06-05 09:37:02 +02:00
lists Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
mutes Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
notifications Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
onboarding Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
picture_in_picture Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
pinned_statuses Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
privacy_policy Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
public_timeline Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
reblogs Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
report Add legal as report category (#23941) 2023-06-06 23:41:59 +02:00
standalone/compose Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
status Change design of dropdowns in web UI (#25107) 2023-06-06 21:49:49 +02:00
subscribed_languages_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
ui Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +02:00
video Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00