mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-30 01:39:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/main' into develop

Browse source
This commit is contained in:
Jeremy Kescher 2022-11-05 12:26:08 +01:00
commit 96afc222d2
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/ui/components/column_link.js
View file

@ -34,7 +34,7 @@ const ColumnLink = ({ icon, text, to, onClick, href, method, badge, transparent,
return ( return (
<a href='#' onClick={onClick && handleOnClick} className={className} title={text} {...other} tabIndex='0'> <a href='#' onClick={onClick && handleOnClick} className={className} title={text} {...other} tabIndex='0'>
{iconElement} {iconElement}
{text} <span>{text}</span>
{badgeElement} {badgeElement}
</a> </a>
); );

5
app/lib/user_settings_decorator.rb
View file

@ -32,6 +32,7 @@ class UserSettingsDecorator
user.settings['system_font_ui'] = system_font_ui_preference if change?('setting_system_font_ui') user.settings['system_font_ui'] = system_font_ui_preference if change?('setting_system_font_ui')
user.settings['system_emoji_font'] = system_emoji_font_preference if change?('setting_system_emoji_font') user.settings['system_emoji_font'] = system_emoji_font_preference if change?('setting_system_emoji_font')
user.settings['noindex'] = noindex_preference if change?('setting_noindex') user.settings['noindex'] = noindex_preference if change?('setting_noindex')
user.settings['hide_followers_count'] = hide_followers_count_preference if change?('setting_hide_followers_count')
user.settings['flavour'] = flavour_preference if change?('setting_flavour') user.settings['flavour'] = flavour_preference if change?('setting_flavour')
user.settings['skin'] = skin_preference if change?('setting_skin') user.settings['skin'] = skin_preference if change?('setting_skin')
user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs') user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
@ -117,6 +118,10 @@ class UserSettingsDecorator
settings['setting_skin'] settings['setting_skin']
end end
def hide_followers_count_preference
boolean_cast_setting 'setting_hide_followers_count'
end
def show_application_preference def show_application_preference
boolean_cast_setting 'setting_show_application' boolean_cast_setting 'setting_show_application'
end end