namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/features
History
Claire 93c714417f Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
2023-06-10 14:38:04 +02:00
..
about Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
account Change share action from being in action bar to being in dropdown in web UI (#25105) 2023-05-24 11:04:43 +02:00
account_gallery Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +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 branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
direct_timeline Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
directory Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +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 '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +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 Update inconsistent defaultMessage (#25114) 2023-05-24 12:38:50 +02:00
standalone/compose Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
status Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +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