treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/javascript/mastodon/features
History
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 		2023-10-25 12:14:24 +02:00
..
about Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
account Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
account_gallery Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
account_timeline Convert `<Button>` to Typescript (#27492) 2023-10-23 09:43:00 +02:00
audio Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
blocks Rewrite `<LoadingIndicator/>` as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
bookmarked_statuses Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
closed_registrations_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
community_timeline Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
compose Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
direct_timeline Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
directory Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
domain_blocks Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
emoji Rewrite `emoji_unicode_mapping_light` to TS (#25444) 2023-10-24 08:06:14 +00:00
explore Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
favourited_statuses Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
favourites Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
filters Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
firehose Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
follow_requests Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
followed_tags Change icons in web UI (#27385) 2023-10-24 17:45:08 +00: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 Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
hashtag_timeline Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
home_timeline Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
interaction_modal Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
keyboard_shortcuts Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
list_adder Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
list_editor Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
list_timeline Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
lists Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
mutes Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
notifications Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
onboarding Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
picture_in_picture Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
pinned_statuses Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
privacy_policy Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
public_timeline Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
reblogs Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
report Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
standalone/compose Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
status Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
subscribed_languages_modal Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
ui Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
video Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00