From 244196cf4a20005865bf0b9a1d99146e61e59ae4 Mon Sep 17 00:00:00 2001 From: Reverite Date: Sat, 7 Sep 2019 13:05:47 -0700 Subject: Change text on the homepage --- config/locales/simple_form.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 6c315b0ed..8bcd59758 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -51,7 +51,7 @@ en: imports: data: CSV file exported from another Mastodon server invite_request: - text: This will help us review your application + text: 'If you are interested in signing up, please put whether you are a plural system or singlet in the "Why do you want to join" box. This is purely to ward off spam bots. If this is not answered, your request to join the instance will be rejected.' sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' tag: -- cgit From 1e75b3d874973dd71ea74b158ebeb501d9ac68a3 Mon Sep 17 00:00:00 2001 From: Reverite Date: Fri, 20 Sep 2019 18:18:22 -0700 Subject: Fix link footer component --- Dockerfile | 2 +- .../glitch/features/ui/components/link_footer.js | 38 ++-------------------- config/webpacker.yml | 2 +- 3 files changed, 5 insertions(+), 37 deletions(-) (limited to 'config') diff --git a/Dockerfile b/Dockerfile index 9ad80c0de..359126f3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,7 +115,7 @@ ENV BIND="0.0.0.0" USER mastodon # Precompile assets -RUN cd ~ && OTP_SECRET=_ SECRET_KEY_BASE=_ rails assets:precompile && yarn cache clean +RUN cd ~ && OTP_SECRET=_ SECRET_KEY_BASE=_ rails assets:precompile --trace && yarn cache clean # Empty temporary files USER root diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js index 04a2e9761..71291fae9 100644 --- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js +++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js @@ -4,38 +4,6 @@ import PropTypes from 'prop-types'; import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'; import { Link } from 'react-router-dom'; import { invitesEnabled, version, repository, source_url } from 'flavours/glitch/util/initial_state'; -<<<<<<< HEAD -import { signOutLink } from 'flavours/glitch/util/backend_links'; - -const LinkFooter = () => ( -
-
    - {invitesEnabled &&
  • ·
    • } -
  • ·
    • -
  • ·
    • -
  • ·
    • -
  • ·
    • -
  • ·
    • -
  • ·
    • -
    • -
- -

- pluralcafe/mastodon (v{version}), - Glitchsoc: glitch-soc/mastodon, - Mastodon: Mastodon }} - /> -

-
-); - -LinkFooter.propTypes = { -}; -======= import { signOutLink, securityLink } from 'flavours/glitch/util/backend_links'; import { logOut } from 'flavours/glitch/util/log_out'; import { openModal } from 'flavours/glitch/actions/modal'; @@ -63,7 +31,6 @@ class LinkFooter extends React.PureComponent { onLogout: PropTypes.func.isRequired, intl: PropTypes.object.isRequired, }; ->>>>>>> glitch handleLogoutClick = e => { e.preventDefault(); @@ -91,9 +58,10 @@ class LinkFooter extends React.PureComponent {

glitch-soc/mastodon (v{version}), + github: pluralcafe/mastodon (v{version}), + Glitchsoc: glitch-soc/mastodon, Mastodon: Mastodon }} />

diff --git a/config/webpacker.yml b/config/webpacker.yml index 9accd6152..a80144b92 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -7,7 +7,7 @@ default: &default public_output_path: packs cache_path: tmp/cache/webpacker check_yarn_integrity: false - webpack_compile_output: false + webpack_compile_output: true # Additional paths webpack should lookup modules # ['app/assets', 'engine/foo/app/assets'] -- cgit From 333b5e25f0a615a9518d402ef10dceb70190a52f Mon Sep 17 00:00:00 2001 From: Reverite Date: Thu, 3 Oct 2019 16:02:27 -0700 Subject: Small changes --- app/javascript/flavours/glitch/features/ui/components/link_footer.js | 2 +- .../flavours/glitch/features/ui/components/onboarding_modal.js | 2 +- config/webpacker.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js index 71291fae9..f8d0d528d 100644 --- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js +++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js @@ -61,7 +61,7 @@ class LinkFooter extends React.PureComponent { defaultMessage='GlitchCafe is open source software, based on {Glitchsoc} which is a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.' values={{ github: pluralcafe/mastodon (v{version}), - Glitchsoc: glitch-soc/mastodon, + Glitchsoc: glitch-soc/mastodon, Mastodon: Mastodon }} />

diff --git a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js index 7419e2cd9..935c26be6 100644 --- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js @@ -141,7 +141,7 @@ const PageSix = ({ admin, domain }) => {

{adminSection} -

fork, Mastodon: Mastodon, Glitchsoc: Glitchsoc, github: GitHub }} />

+

fork, Mastodon: Mastodon, github: GitHub }} />

}} />

diff --git a/config/webpacker.yml b/config/webpacker.yml index a80144b92..9accd6152 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -7,7 +7,7 @@ default: &default public_output_path: packs cache_path: tmp/cache/webpacker check_yarn_integrity: false - webpack_compile_output: true + webpack_compile_output: false # Additional paths webpack should lookup modules # ['app/assets', 'engine/foo/app/assets'] -- cgit From 48635bf45f6402c8f82d4cb66fa42e3e5e8f30c2 Mon Sep 17 00:00:00 2001 From: Reverite Date: Wed, 6 Nov 2019 17:56:52 -0500 Subject: include jortage in csp --- config/initializers/content_security_policy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 810aa2880..c07af3ea8 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -31,9 +31,9 @@ if Rails.env.production? p.frame_ancestors :none p.script_src :self, assets_host p.font_src :self, assets_host - p.img_src :self, :data, :blob, *data_hosts + p.img_src :self, :data, :blob, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com" p.style_src :self, :unsafe_inline, assets_host - p.media_src :self, :data, *data_hosts + p.media_src :self, :data, *data_hosts, "pool.jortage.com", "blob.jortage.com", "s3-us-east-2.amazonaws.com" p.frame_src :self, :https p.worker_src :self, :blob, assets_host p.connect_src :self, :blob, :data, Rails.configuration.x.streaming_api_base_url, *data_hosts -- cgit