me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Claire 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
..
about Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
account Change "bot" label to "automated" (#25356) 2023-06-11 04:47:07 +02:00
account_gallery Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
account_timeline Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
audio Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
blocks Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +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 '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00
direct_timeline Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
directory Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
domain_blocks Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
emoji Rewrite emoji_mart_data_light as TS (#25138) 2023-06-13 19:28:31 +02:00
explore Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
favourited_statuses Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
favourites Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +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 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 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 <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
lists Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
mutes Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
notifications Add missing report category translation (#25400) 2023-06-13 15:05:40 +02:00
onboarding Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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 Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
report Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
standalone/compose Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
status Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
subscribed_languages_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
ui Fix always redirecting to onboarding in web UI (#25396) 2023-06-14 09:05:03 +02:00
video Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00