namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/features
History
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +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 Do not leave Mastodon when clicking “Back” (#23953) 2023-03-04 23:18:19 +01:00
video Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00