izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/app/javascript/mastodon/features
History
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
2023-08-24 21:56:00 +02:00
..
about Prevent duplicate concurrent calls of /api/*/instance in web UI (#25663) 2023-07-02 11:12:16 +02:00
account Fix unfollow icon styling in advanced column (#26482) 2023-08-14 19:02:47 +02:00
account_gallery Fix missing GIF badge in account gallery (#26166) 2023-07-26 03:33:31 +02:00
account_timeline Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
audio Fix missing action label on sensitive videos and embeds in web UI (#26135) 2023-07-24 22:04:38 +02:00
blocks Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
bookmarked_statuses Remove back button from bookmarks, favourites and lists screens in web UI (#26126) 2023-07-23 17:55:20 +02:00
closed_registrations_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
community_timeline Convert <DismissableBanner> to Typescript (#25582) 2023-07-08 11:12:20 +02:00
compose Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
direct_timeline Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
directory fix buttons showing inconsistent styles (#25903) 2023-07-11 12:26:09 +02:00
domain_blocks Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
emoji Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
explore Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
favourited_statuses Remove back button from bookmarks, favourites and lists screens in web UI (#26126) 2023-07-23 17:55:20 +02:00
favourites Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
filters Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
firehose Convert <DismissableBanner> to Typescript (#25582) 2023-07-08 11:12:20 +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 Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
following Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
getting_started Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
hashtag_timeline Change the hashtag column to not display the hashtag header on pinned columns (#26416) 2023-08-09 16:32:40 +02:00
home_timeline Change the wording of the dismissable explore prompt (#25917) 2023-07-27 16:51:02 +02:00
interaction_modal Fix "Create Account" button in interaction modal (#26459) 2023-08-14 12:04:04 +02:00
keyboard_shortcuts Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +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 <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
lists Remove back button from bookmarks, favourites and lists screens in web UI (#26126) 2023-07-23 17:55:20 +02:00
mutes Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
notifications Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
onboarding Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
picture_in_picture Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
pinned_statuses Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
privacy_policy Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
public_timeline Fix public TL not indicating new toots when onlyRemote is enabled (#26247) 2023-07-29 20:18:38 +02:00
reblogs Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
report Add forward_to_domains parameter to POST /api/v1/reports (#25866) 2023-07-10 18:26:56 +02:00
standalone/compose Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
status Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
subscribed_languages_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
ui Fix selecting domains to forward reports to not passing the information correctly (#26636) 2023-08-24 14:06:27 +02:00
video Fix missing action label on sensitive videos and embeds in web UI (#26135) 2023-07-24 22:04:38 +02:00