From 5e5298286799c9d220e4ba5a5be3a3fb604ea891 Mon Sep 17 00:00:00 2001 From: Marco Blessing Date: Mon, 15 Feb 2021 19:33:32 +0100 Subject: [PATCH] Merge/2021 02 15 (#3) * fix(#744): Escape special characters in title (#745) * add matt artist as sponsor * Fix margin top alignment issue on Safari (#750) * Update README.md * Update README.md * Update README.md * Update README.md * Remove references to any public Staticman API instance (#775) * Update CHANGELOG.md Co-authored-by: Dmitry Co-authored-by: Dean Attali Co-authored-by: Amy Troschinetz Co-authored-by: Dean Attali Co-authored-by: Vincent Tam --- CHANGELOG.md | 3 ++- _config.yml | 20 ++++++++++---------- assets/js/staticman.js | 2 +- staticman.yml | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60fe0e5..374c031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,13 @@ - Slightly reworked margins and position for avatar image to resolve an alignment issue on Safari. - Changed the width at which the navbar collapses to a higher threshold because most modern non-mobile browsers are >1000px -- Fixed bug where navbar secondary level dropdown items didn't inherit te same colour as the primary navbar links +- Fixed bug where navbar secondary level dropdown items didn't inherit the same colour as the primary navbar links - Fixed bug where the navbar "burger" collapsed button didn't always revert back to a light colour - Fixed bug where using an image as a navbar title did not render in GitHub Project pages that did not have a custom domain - Fixed issue where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio - Added support for Patreon in the social network links in the footer - Fixed bug where special characters in the title led to broken share tags (#744) +- Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) ## v5.0.0 (2020-09-15) diff --git a/_config.yml b/_config.yml index 9644d21..0bcd2a3 100644 --- a/_config.yml +++ b/_config.yml @@ -161,19 +161,19 @@ footer-link-col: "#404040" # theme: github-light # Utterances theme # label: blog-comments # Label that will be assigned to GitHub Issues created by Utterances -# To use Staticman comments, first invite `staticmanlab` as a collaborator to your repository and -# accept the invitation by going to `https://staticman3.herokuapp.com/v3/connect/github//`. -# Then uncomment the following section and fill in "repository" and "branch". -# If you want to use reCaptcha for staticman (optional for spam protection), then fill -# in the "siteKey" and "secret" parameters below and also in `staticman.yml`. -# See more details at https://staticman.net/ +# To use Staticman comments, uncomment the following section. You may leave the reCaptcha +# section commented if you aren't using reCaptcha for spam protection. +# Using Staticman requires advanced knowledge, please consult +# https://github.com/eduardoboucas/staticman/ and https://staticman.net/ for further +# instructions. For any support with staticman please direct questions to staticman and +# not to BeautifulJekyll. #staticman: # repository : # GitHub username/repository eg. "daattali/beautiful-jekyll" # branch : master # If you're not using `master` branch, then you also need to update the `branch` parameter in `staticman.yml` -# endpoint : # (optional) URL of your own deployment, with a trailing slash eg. https:///v3/entry/github/ (will fallback to a public GitLab instance) -# reCaptcha: -# siteKey : # Use your own site key, you need to apply for one on Google -# secret : # ENCRYPT your password by going to https://staticman3.herokuapp.com/v3/encrypt/ +# endpoint : # URL of your deployment, with a trailing slash eg. "https:///v3/entry/github/" +# reCaptcha: # (optional, set these parameters in `staticman.yml` as well) +# siteKey : # You need to apply for a site key on Google +# secret : # Encrypt your password by going to https:///v3/encrypt/ # --- Misc --- # diff --git a/assets/js/staticman.js b/assets/js/staticman.js index 09422a6..e8bdfbe 100644 --- a/assets/js/staticman.js +++ b/assets/js/staticman.js @@ -11,7 +11,7 @@ layout: null $(form).addClass('disabled'); {% assign sm = site.staticman -%} - var endpoint = '{{ sm.endpoint | default: "https://staticman3.herokuapp.com/v3/entry/github/" }}'; + var endpoint = '{{ sm.endpoint }}'; var repository = '{{ sm.repository }}'; var branch = '{{ sm.branch }}'; diff --git a/staticman.yml b/staticman.yml index 8fe1bad..45e939b 100644 --- a/staticman.yml +++ b/staticman.yml @@ -5,7 +5,7 @@ # To encrypt strings use the following endpoint: # https://{STATICMAN API INSTANCE}/v3/encrypt/{TEXT TO BE ENCRYPTED} # {STATICMAN API INSTANCE} should match the `endpoint` in the theme config -# file. It defaults to "staticman3.herokuapp.com". +# file. comments: # (*) REQUIRED