treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/javascript/mastodon/features
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
 		2023-02-25 14:00:40 +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 Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
account_timeline Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
audio Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +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 preview card (#23869) 2023-02-24 20:04:38 +01:00
subscribed_languages_modal Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
ui Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
video Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00