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 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 		2024-12-25 18:01:37 +01:00
..
about Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
account Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
account_gallery Add ability to view alt text by clicking the ALT badge in web UI (#32058) 2024-09-26 13:26:49 +00:00
account_timeline Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
annual_report Change percentile label in year in review in web UI (#33148) 2024-12-03 08:57:29 +00:00
audio
…
blocks Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
bookmarked_statuses
…
closed_registrations_modal
…
community_timeline Fix column-settings spacing in local timeline in advanced view (#32567) 2024-10-18 07:40:08 +00:00
compose Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
direct_timeline Change design of unread conversations in web UI (#31763) 2024-09-05 09:39:59 +00:00
directory Refactor `<Column>` to TypeScript (#33081) 2024-12-02 20:07:48 +00:00
domain_blocks Change design of confirmation modals in web UI (#30884) 2024-07-25 17:05:54 +00:00
emoji Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
explore Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
favourited_statuses
…
favourites Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
filters
…
firehose Change "social web" to "fediverse" in a few banners in web UI (#33101) 2024-11-29 16:44:05 +00:00
follow_requests Fix list of follow requests not having a back button (#32797) 2024-11-07 11:45:46 +00:00
followed_tags
…
followers Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
following Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
getting_started Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
hashtag_timeline Refactor `<HashtagHeader>` to TypeScript (#33096) 2024-12-06 08:42:24 +00:00
home_timeline Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
interaction_modal Change design of interaction modal in web UI (#33278) 2024-12-17 12:36:32 +00:00
keyboard_shortcuts Add `/` keyboard shortcut to focus the search field (#29921) 2024-04-12 09:42:12 +00:00
link_timeline Refactor `<Column>` to TypeScript (#33081) 2024-12-02 20:07:48 +00:00
list_adder Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
list_timeline Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
lists Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
mutes Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
notifications Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
notifications_v2 Change label of grouped favourite notification on private mentions (#31659) 2024-12-11 10:25:51 +00:00
onboarding Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
picture_in_picture Fix reblog icons on account media view (#32506) 2024-10-15 10:01:21 +00:00
pinned_statuses
…
privacy_policy Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
public_timeline Change "social web" to "fediverse" in a few banners in web UI (#33101) 2024-11-29 16:44:05 +00:00
reblogs Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
report
…
search Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
standalone Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
status Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
subscribed_languages_modal Update immutable imports for v5 (#33037) 2024-11-22 22:23:02 +00:00
terms_of_service Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
ui Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
video
…