Merge remote-tracking branch 'upstream/master' into merge/2021-02-15

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)
 

_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
+# To use Staticman comments, uncomment the following section. You may leave the reCaptcha
-# accept the invitation by going to `https://staticman3.herokuapp.com/v3/connect/github/<username>/<repo-name>`.
+# section commented if you aren't using reCaptcha for spam protection. 
-# Then uncomment the following section and fill in "repository" and "branch".
+# Using Staticman requires advanced knowledge, please consult 
-# If you want to use reCaptcha for staticman (optional for spam protection), then fill
+# https://github.com/eduardoboucas/staticman/ and https://staticman.net/ for further 
-# in the "siteKey" and "secret" parameters below and also in `staticman.yml`.
+# instructions. For any support with staticman please direct questions to staticman and 
-# See more details at https://staticman.net/
+# 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://<your-api>/v3/entry/github/ (will fallback to a public GitLab instance)
+#  endpoint   : # URL of your deployment, with a trailing slash eg. "https://<your-api>/v3/entry/github/"
-#  reCaptcha:
+#  reCaptcha:   # (optional, set these parameters in `staticman.yml` as well) 
-#    siteKey  : # Use your own site key, you need to apply for one on Google
+#    siteKey  : # You need to apply for a site key on Google
-#    secret   : # ENCRYPT your password by going to https://staticman3.herokuapp.com/v3/encrypt/<your-site-secret>
+#    secret   : # Encrypt your password by going to https://<your-own-api>/v3/encrypt/<your-site-secret>
 
 # --- Misc --- #
 

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 }}';
 

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