CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
1cd7f5ff17
puyopuyotetr.is/app/javascript/mastodon/features
History
Claire 1cd7f5ff17 Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
..
about Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
account Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
account_gallery Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
account_timeline Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
direct_timeline Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
directory Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
onboarding Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
picture_in_picture Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
standalone/compose Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
status Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
subscribed_languages_modal Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
ui Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
video Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00