diff --git a/README.md b/README.md index 874f93f03..ff87ab558 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,12 @@ Photo by [Joana Mujollari](https://www.flickr.com/photos/141654969@N04/267773390 Mastodon is a **free, open-source social network server** based on ActivityPub. This is *not* the official version of Mastodon; this is a separate version (i.e. a fork) maintained by [Darius Kazemi](https://friend.camp/@darius). For more information on Mastodon, you can see the [official website](https://joinmastodon.org) and the [upstream repo](https://github.com/tootsuite/mastodon). -__Hometown__ is a light weight fork of Mastodon. This fork is based on the principle of: minimum code change for maximum user experience change. +__Hometown__ is a light weight fork of Mastodon. This fork is based on the principle of: minimum code change for maximum user experience change. These changes aren't wanted by Eugene, Mastodon's owner, and can't be upstreamed, ence the fork. Please [check out our wiki](https://github.com/hometown-fork/hometown/wiki) for a list of Hometown-exclusive features. Some but not all of these are covered in this document. +You can also find [a list of running Hometown instances](https://github.com/hometown-fork/hometown/wiki/Hometown-servers), don't hesitate to open an issue to add yours! + ## Support this project Please consider [supporting Hometown by pledging to my Patreon](https://www.patreon.com/tinysubversions), which supports all my open source projects including this one! @@ -64,13 +66,7 @@ What does this have to do with content types? Well, if we support an `Article` c If Hometown is going to be a universal reader, you're going to need better control over organizing your feeds than mainline Mastodon provides. -### Exclusive lists - -My first plan is to introduce a new kind of _exclusive list_. Right now if you add an account to your "friends I like" list in Mastodon, posts from people on that list appear on that list. But they also appear on your home timeline, and maybe you don't want that! You'd rather treat your "friends I like" list as your "real" home timeline, and then check your home timeline when you're bored. - -Or another case: I might have all the blogs I read in one list, but I only check it on Saturdays when I have time to read things. In that case I don't want updates from those blogs clogging up my home timeline. - -> This is not yet implemented but will be available in the first release. +I've introduced a new kind of [exclusive list](https://github.com/hometown-fork/hometown/wiki/Exclusive-lists). In vanilla Mastodon, if you add an account to your "friends I like" list, posts from people on that list appear on that list. But they also appear on your home timeline, and maybe you don't want that! You'd rather treat your "friends I like" list as your "real" home timeline, and then check your home timeline when you're bored. Check out [more details about exclusive lists on the wiki](https://github.com/hometown-fork/hometown/wiki/Exclusive-lists). ## Better accessibility defaults diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index 134217734..37b75a5b1 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -99,10 +99,6 @@ module AccountsHelper end def svg_logo - content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976') - end - - def svg_logo_full - content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678') + content_tag(:svg, tag(:use, 'xlink:href' => '#hometownlogo'), 'viewBox' => '0 0 216.4144 232.00976') end end diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index 3a3026378..1e911efff 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -361,7 +361,7 @@ class EmojiPickerDropdown extends React.PureComponent { 🙂 diff --git a/app/javascript/styles/macaron.scss b/app/javascript/styles/macaron.scss index a366a2361..98677275d 100644 --- a/app/javascript/styles/macaron.scss +++ b/app/javascript/styles/macaron.scss @@ -1,3 +1,3 @@ @import 'macaron/variables'; @import 'application'; -@import 'macaron/diff' +@import 'macaron/diff'; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d0f4fb47f..d12e0d430 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -38,4 +38,3 @@ .logo-resources = render file: Rails.root.join('app', 'javascript', 'images', 'hometown.svg') - = render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg') diff --git a/config/locales/en.yml b/config/locales/en.yml index 9e4808ec8..b96368072 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -92,7 +92,7 @@ en: delete: Delete destroyed_msg: Moderation note successfully destroyed! accounts: - add_email_domain_block: Blacklist e-mail domain + add_email_domain_block: Blocklist e-mail domain approve: Approve approve_all: Approve all are_you_sure: Are you sure? @@ -193,7 +193,7 @@ en: username: Username warn: Warn web: Web - whitelisted: Whitelisted + whitelisted: Allowlisted action_logs: action_types: assigned_to_self_report: Assign Report @@ -238,15 +238,15 @@ en: create_account_warning: "%{name} sent a warning to %{target}" create_announcement: "%{name} created new announcement %{target}" create_custom_emoji: "%{name} uploaded new emoji %{target}" - create_domain_allow: "%{name} whitelisted domain %{target}" + create_domain_allow: "%{name} allowlisted domain %{target}" create_domain_block: "%{name} blocked domain %{target}" - create_email_domain_block: "%{name} blacklisted e-mail domain %{target}" + create_email_domain_block: "%{name} blocklisted e-mail domain %{target}" demote_user: "%{name} demoted user %{target}" destroy_announcement: "%{name} deleted announcement %{target}" destroy_custom_emoji: "%{name} destroyed emoji %{target}" - destroy_domain_allow: "%{name} removed domain %{target} from whitelist" + destroy_domain_allow: "%{name} removed domain %{target} from allowlist" destroy_domain_block: "%{name} unblocked domain %{target}" - destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}" + destroy_email_domain_block: "%{name} allowlisted e-mail domain %{target}" destroy_status: "%{name} removed status by %{target}" disable_2fa_user: "%{name} disabled two factor requirement for user %{target}" disable_custom_emoji: "%{name} disabled emoji %{target}" @@ -346,12 +346,12 @@ en: week_interactions: interactions this week week_users_active: active this week week_users_new: users this week - whitelist_mode: Whitelist mode + whitelist_mode: allowlist mode domain_allows: - add_new: Whitelist domain - created_msg: Domain has been successfully whitelisted - destroyed_msg: Domain has been removed from the whitelist - undo: Remove from whitelist + add_new: Add domain to allowlist + created_msg: Domain has been successfully added to allowlist + destroyed_msg: Domain has been removed from the allowlist + undo: Remove from allowlist domain_blocks: add_new: Add new domain block created_msg: Domain block is now being processed @@ -394,16 +394,16 @@ en: view: View domain block email_domain_blocks: add_new: Add new - created_msg: Successfully added e-mail domain to blacklist + created_msg: Successfully added e-mail domain to blocklist delete: Delete - destroyed_msg: Successfully deleted e-mail domain from blacklist + destroyed_msg: Successfully deleted e-mail domain from blocklist domain: Domain - empty: No e-mail domains currently blacklisted. + empty: No e-mail domains currently blocklisted. from_html: from %{domain} new: create: Add domain - title: New e-mail blacklist entry - title: E-mail blacklist + title: New e-mail blocklist entry + title: E-mail blocklist instances: by_domain: Domain delivery_available: Delivery is available @@ -447,7 +447,7 @@ en: pending: Waiting for relay's approval save_and_enable: Save and enable setup: Setup a relay connection - signatures_not_enabled: Relays will not work correctly while secure mode or whitelist mode is enabled + signatures_not_enabled: Relays will not work correctly while secure mode or allowlist mode is enabled status: Status title: Relays report_notes: diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index a38a36e38..8607daf36 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -181,11 +181,11 @@ en_GB: create_account_warning: "%{name} sent a warning to %{target}" create_custom_emoji: "%{name} uploaded new emoji %{target}" create_domain_block: "%{name} blocked domain %{target}" - create_email_domain_block: "%{name} blacklisted e-mail domain %{target}" + create_email_domain_block: "%{name} blocklisted e-mail domain %{target}" demote_user: "%{name} demoted user %{target}" destroy_custom_emoji: "%{name} destroyed emoji %{target}" destroy_domain_block: "%{name} unblocked domain %{target}" - destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}" + destroy_email_domain_block: "%{name} allowlisted e-mail domain %{target}" destroy_status: "%{name} removed status by %{target}" disable_2fa_user: "%{name} disabled two factor requirement for user %{target}" disable_custom_emoji: "%{name} disabled emoji %{target}" @@ -289,14 +289,14 @@ en_GB: undo: Undo domain block email_domain_blocks: add_new: Add new - created_msg: Successfully added e-mail domain to blacklist + created_msg: Successfully added e-mail domain to blocklist delete: Delete - destroyed_msg: Successfully deleted e-mail domain from blacklist + destroyed_msg: Successfully deleted e-mail domain from blocklist domain: Domain new: create: Add domain - title: New e-mail blacklist entry - title: E-mail blacklist + title: New e-mail blocklist entry + title: E-mail blocklist followers: back_to_account: Back To Account title: "%{acct}'s Followers"