mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/javascript/mastodon/features
History
Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
 		2023-01-05 14:16:25 +01:00
..
about Fix WebUI crash when listing server blocks and rationale is not available (#20408) 2022-11-11 21:23:03 +01:00
account Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01:00
account_gallery Fix media markup (#21420) 2022-12-15 18:37:47 +01:00
account_timeline Fix infinite loading instead of soft 404 for non-existing remote accounts (#21303) 2022-11-27 20:48:12 +01:00
audio Add warning for sensitive audio posts (#17885) 2022-08-13 15:39:05 +02:00
blocks Fix block/mute lists showing a follow button when unblocking a user (#18364) 2022-05-09 23:20:19 +02:00
bookmarked_statuses Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
closed_registrations_modal Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
community_timeline Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
compose Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
direct_timeline Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
directory Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
domain_blocks Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
emoji Remove use of DOMParser in front-end emoji rewriting code (#20758) 2022-11-17 11:24:59 +01:00
explore `FormattedMessage` must be used directly (#20982) 2022-12-15 16:20:46 +01:00
favourited_statuses Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
favourites Fix compose form submission reloading web interface (#19762) 2022-11-05 13:43:37 +01:00
filters Fix compose form submission reloading web interface (#19762) 2022-11-05 13:43:37 +01:00
follow_recommendations Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
follow_requests Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
followers Fix media, following and followers tabs in web UI (#19426) 2022-10-23 23:38:08 +02:00
following Fix media, following and followers tabs in web UI (#19426) 2022-10-23 23:38:08 +02:00
generic_not_found
…
getting_started Make the 'Trending now' header a link to Explore. (#21759) 2022-11-27 23:49:32 +01:00
hashtag_timeline Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
home_timeline Remove aria-pressed where it's redundant (#19912) 2022-11-08 17:31:32 +01:00
interaction_modal Fix confusing wording in interaction modal in web UI (#20302) 2022-11-10 08:49:48 +01:00
keyboard_shortcuts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
list_adder
…
list_editor
…
list_timeline Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
lists Change design of new list form in web UI (#19801) 2022-11-05 23:06:32 +01:00
mutes Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
notifications Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
picture_in_picture Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
pinned_statuses Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
privacy_policy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
public_timeline Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
reblogs Fix compose form submission reloading web interface (#19762) 2022-11-05 13:43:37 +01:00
report Fix missing rules in report modal in web UI (#19387) 2022-10-18 19:33:11 +02:00
standalone/compose Remove code for rendering public and hashtag timelines outside the web UI (#19257) 2022-10-04 20:13:46 +02:00
status Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01:00
subscribed_languages_modal Fix “Change subscribed languages” crashing in some situations (#19268) 2022-10-03 02:56:12 +02:00
ui Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
video Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00