alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/mastodon/features
History
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
 		2022-10-30 18:15:28 +01:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
account Change layout of posts in web UI (#19423) 2022-10-25 19:02:21 +02:00
account_gallery Fix media, following and followers tabs in web UI (#19426) 2022-10-23 23:38:08 +02:00
account_timeline Fix case-sensitive look-up for profiles in web UI (#19397) 2022-10-21 10:06:03 +02: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 Fix closed registrations message not appearing in web UI (#19508) 2022-10-28 19:34:22 +02: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 2022-10-30 18:15:28 +01:00
direct_timeline Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
directory Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
domain_blocks Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
emoji Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00
explore Remove navigation links to /explore when trends are disabled (#19415) 2022-10-25 19:03:16 +02:00
favourited_statuses Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
favourites Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
filters Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
follow_recommendations Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
follow_requests Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02: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 Remove navigation links to /explore when trends are disabled (#19415) 2022-10-25 19:03:16 +02:00
hashtag_timeline Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home_timeline Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
interaction_modal Add closed registrations modal (#19437) 2022-10-26 19:35:55 +02: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 Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
lists Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
mutes Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
notifications Fix notifications about deleted reports not being also deleted (#19475) 2022-10-27 02:10:54 +02:00
picture_in_picture Add interaction modal to logged-out web UI (#19306) 2022-10-07 10:14:31 +02: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 Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02: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 Fix missing delete and redraft link in web UI (#19485) 2022-10-27 19:17:15 +02:00
subscribed_languages_modal Fix “Change subscribed languages” crashing in some situations (#19268) 2022-10-03 02:56:12 +02:00
ui Add closed registrations modal (#19437) 2022-10-26 19:35:55 +02:00
video Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00