mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-29 16:39:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/mastodon/features
History
Jeremy Kescher 68101baae1
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	app/controllers/settings/preferences_controller.rb
#	app/javascript/mastodon/utils/resize_image.js
#	app/lib/user_settings_decorator.rb
#	app/models/media_attachment.rb
#	app/models/user.rb
#	app/views/settings/preferences/appearance/show.html.haml
#	app/workers/scheduler/indexing_scheduler.rb
#	config/settings.yml
#	db/schema.rb
2023-04-03 21:50:15 +02:00
..
about Fix regressions from change in account row design in web UI (#24343) 2023-04-01 09:27:23 +02:00
account Change "direct message" nomenclature to "private mention" in web UI (#24248) 2023-03-30 15:16:20 +02:00
account_gallery Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
account_timeline Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
audio Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01: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 remote-tracking branch 'upstream/main' into develop 2023-03-28 17:31:34 +02:00
direct_timeline Change "direct message" nomenclature to "private mention" in web UI (#24248) 2023-03-30 15:16:20 +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 Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
explore Fix: set multiColumn value for /explore Statuses (#24314) 2023-03-30 10:14:49 +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 Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
follow_recommendations Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01: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 Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
following Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
generic_not_found Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
getting_started Change "direct message" nomenclature to "private mention" in web UI (#24248) 2023-03-30 15:16:20 +02:00
hashtag_timeline Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01: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 Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
list_timeline Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01: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 Merge remote-tracking branch 'upstream/main' into develop 2023-03-28 17:31: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 Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
standalone/compose Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
status Merge remote-tracking branch 'upstream/main' into develop 2023-04-03 21:50:15 +02:00
subscribed_languages_modal Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00
ui Merge remote-tracking branch 'upstream/main' into develop 2023-04-03 21:50:15 +02:00
video Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00