rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove/update old "tootsuite" references, except those needed for Docker (#1860)

shrike
Jeremy Kescher 2022-11-01 08:38:05 +00:00 committed by GitHub
parent 968f343006
commit 41885c8715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production.sample
View File

@ -17,7 +17,7 @@
LOCAL_DOMAIN=example.com LOCAL_DOMAIN=example.com
# Use this only if you need to run mastodon on a different domain than the one used for federation. # Use this only if you need to run mastodon on a different domain than the one used for federation.
# You can read more about this option on https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Serving_a_different_domain.md # You can read more about this option on https://docs.joinmastodon.org/admin/config/#web-domain
# DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING. # DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING.
# WEB_DOMAIN=mastodon.example.com # WEB_DOMAIN=mastodon.example.com
@ -247,7 +247,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
# --------------- # ---------------
# Various ways to customize Mastodon's behavior # Various ways to customize Mastodon's behavior
# --------------- # ---------------
# Maximum allowed character count # Maximum allowed character count
MAX_TOOT_CHARS=500 MAX_TOOT_CHARS=500

2
CONTRIBUTING.md
View File

@ -27,7 +27,7 @@ See the guidelines below.
- - - - - -
You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `tootsuite/mastodon`, reproduced below. You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `mastodon/mastodon`, reproduced below.
<blockquote> <blockquote>

2
app/javascript/flavours/glitch/components/intersection_observer_article.js
View File

@ -94,7 +94,7 @@ export default class IntersectionObserverArticle extends React.Component {
// When the browser gets a chance, test if we're still not intersecting, // When the browser gets a chance, test if we're still not intersecting,
// and if so, set our isHidden to true to trigger an unrender. The point of // and if so, set our isHidden to true to trigger an unrender. The point of
// this is to save DOM nodes and avoid using up too much memory. // this is to save DOM nodes and avoid using up too much memory.
// See: https://github.com/tootsuite/mastodon/issues/2900 // See: https://github.com/mastodon/mastodon/issues/2900
this.setState((prevState) => ({ isHidden: !prevState.isIntersecting })); this.setState((prevState) => ({ isHidden: !prevState.isIntersecting }));
} }

4
app/javascript/flavours/glitch/features/ui/components/link_footer.js
View File

@ -42,7 +42,7 @@ class LinkFooter extends React.PureComponent {
e.stopPropagation(); e.stopPropagation();
this.props.onLogout(); this.props.onLogout();
return false; return false;
} }
@ -84,7 +84,7 @@ class LinkFooter extends React.PureComponent {
defaultMessage='Glitchsoc is open source software, a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.' defaultMessage='Glitchsoc is open source software, a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.'
values={{ values={{
github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span>, github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span>,
Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener noreferrer' target='_blank'>Mastodon</a> }} Mastodon: <a href='https://github.com/mastodon/mastodon' rel='noopener noreferrer' target='_blank'>Mastodon</a> }}
/> />
</p> </p>
</div> </div>

2
app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
View File

@ -148,7 +148,7 @@ const PageSix = ({ admin, domain }) => {
values={{ values={{
domain, domain,
fork: <a href='https://en.wikipedia.org/wiki/Fork_(software_development)' target='_blank' rel='noopener'>fork</a>, fork: <a href='https://en.wikipedia.org/wiki/Fork_(software_development)' target='_blank' rel='noopener'>fork</a>,
Mastodon: <a href='https://github.com/tootsuite/mastodon' target='_blank' rel='noopener'>Mastodon</a>, Mastodon: <a href='https://github.com/mastodon/mastodon' target='_blank' rel='noopener'>Mastodon</a>,
github: <a href={source_url} target='_blank' rel='noopener'>GitHub</a>, github: <a href={source_url} target='_blank' rel='noopener'>GitHub</a>,
}} }}
/> />