me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02:00
..
about Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00
account Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
account_gallery Change all components to use the same error page in web UI (#24512) 2023-04-12 12:44:58 +02:00
account_timeline Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
audio Fix audio player width in thread view (#24713) 2023-04-30 06:42:22 +02:00
blocks Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
bookmarked_statuses Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
closed_registrations_modal Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
community_timeline Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
compose Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
direct_timeline typo: collapsable -> collapsible (#24521) 2023-04-14 11:01:23 +02:00
directory Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
domain_blocks Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
emoji Fix infinite loop in emoji replacement code (#24615) 2023-04-21 18:08:28 +02:00
explore Change label from "For you" to "People" on explore screen in web UI (#24706) 2023-04-28 08:54:20 +02:00
favourited_statuses Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
favourites Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
filters Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00
follow_requests Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
followed_tags Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
followers Change all components to use the same error page in web UI (#24512) 2023-04-12 12:44:58 +02:00
following Change all components to use the same error page in web UI (#24512) 2023-04-12 12:44:58 +02:00
getting_started Fix height of announcements not being updated when using reduced animations (#24354) 2023-04-05 14:58:10 +02:00
hashtag_timeline Add colour to follow button when hashtag is being followed (#24361) 2023-04-03 16:25:15 +02:00
home_timeline Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
interaction_modal Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
keyboard_shortcuts Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
list_adder Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
list_editor Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00
list_timeline Change all components to use the same error page in web UI (#24512) 2023-04-12 12:44:58 +02:00
lists Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
mutes Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
notifications Enable formatjs/prefer-pound-in-plural (#24622) 2023-04-24 08:07:19 +02:00
onboarding Add default post text to onboarding flow in web UI (#24705) 2023-04-28 10:05:34 +02:00
picture_in_picture Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
pinned_statuses Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
privacy_policy Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
public_timeline Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
reblogs Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
report Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00
standalone/compose Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
status Enable formatjs/prefer-pound-in-plural (#24622) 2023-04-24 08:07:19 +02:00
subscribed_languages_modal Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
ui Change logo version in header based on screen size in web UI (#24707) 2023-04-28 10:00:33 +02:00
video Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00