izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/app/javascript/mastodon/features
History
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +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 Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
closed_registrations_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
community_timeline Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
compose Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +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 Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
favourited_statuses Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +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 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +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 '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
picture_in_picture Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +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 Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +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 custom signup URL may not loaded (#25531) 2023-06-22 12:10:49 +02:00
video Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00