CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
193250556c
puyopuyotetr.is/app/javascript/mastodon/features
History
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
..
about Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
account Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
account_gallery Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
account_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
audio Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
blocks Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
bookmarked_statuses Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
closed_registrations_modal Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
community_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
compose Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
direct_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
directory Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
domain_blocks Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
emoji Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
explore Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
favourited_statuses Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
favourites Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
filters Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
follow_recommendations Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
follow_requests Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
followed_tags Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
followers Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
following Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
generic_not_found Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
getting_started Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
hashtag_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
home_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
interaction_modal Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
keyboard_shortcuts Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
list_adder Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
list_editor Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
list_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
lists Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
mutes Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
notifications Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
picture_in_picture Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
pinned_statuses Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
privacy_policy Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
public_timeline Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
reblogs Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
report Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
standalone/compose Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
status Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
subscribed_languages_modal Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
ui Replace Status#translatable? with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
video Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00