diff --git a/CHANGELOG.md b/CHANGELOG.md index 4732695f1..d35e19367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,6 +103,7 @@ Homebrew can be moved, switched off and repaired instead of lost, and a characte - **Site:** on phones the header, menus and ability buttons fit the screen. (#711) - **Server:** blank settings count as unset, Docker secrets work for the login key, and the Windows start scripts find their ports. (#701) - **Server:** without email configured, registration is refused unless explicitly allowed. (#712) +- **Site:** returning visitors download the app again only when it has changed, and see a new release straight away. - **Accounts:** site emails greet you by your preferred name, or by your username when you have not set one, instead of "Hi there". - **Characters:** the builder's tab bar wraps on narrow screens. @@ -192,6 +193,7 @@ Homebrew can be moved, switched off and repaired instead of lost, and a characte - **Accounts:** on a server whose JVM runs a non-English locale, an email address containing a capital I folded to a different account key, so sign-in, password reset, the unsubscribe link and email change could all miss the account. - Sign-in, password reset, share links, image fetching and PDF export are hardened against misuse, and secrets are no longer printed at startup. +- **Site:** pages no longer load fonts from Google, so visiting the site no longer sends your address to Google. ## [breaking/2026-stack-modernization] diff --git a/resources/public/fonts/open-sans/OFL.txt b/resources/public/fonts/open-sans/OFL.txt new file mode 100644 index 000000000..2e76eefd4 --- /dev/null +++ b/resources/public/fonts/open-sans/OFL.txt @@ -0,0 +1,88 @@ +Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/resources/public/fonts/open-sans/open-sans-cyrillic-ext.woff2 b/resources/public/fonts/open-sans/open-sans-cyrillic-ext.woff2 new file mode 100644 index 000000000..307b21403 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-cyrillic-ext.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-cyrillic.woff2 b/resources/public/fonts/open-sans/open-sans-cyrillic.woff2 new file mode 100644 index 000000000..4bce1d029 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-cyrillic.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-greek-ext.woff2 b/resources/public/fonts/open-sans/open-sans-greek-ext.woff2 new file mode 100644 index 000000000..0b0b3a41d Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-greek-ext.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-greek.woff2 b/resources/public/fonts/open-sans/open-sans-greek.woff2 new file mode 100644 index 000000000..5bd7b8ff1 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-greek.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-hebrew.woff2 b/resources/public/fonts/open-sans/open-sans-hebrew.woff2 new file mode 100644 index 000000000..bed5b67c8 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-hebrew.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-latin-ext.woff2 b/resources/public/fonts/open-sans/open-sans-latin-ext.woff2 new file mode 100644 index 000000000..08bed85e3 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-latin-ext.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-latin.woff2 b/resources/public/fonts/open-sans/open-sans-latin.woff2 new file mode 100644 index 000000000..b5d54e762 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-latin.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-math.woff2 b/resources/public/fonts/open-sans/open-sans-math.woff2 new file mode 100644 index 000000000..a804b105c Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-math.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-symbols.woff2 b/resources/public/fonts/open-sans/open-sans-symbols.woff2 new file mode 100644 index 000000000..b96960208 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-symbols.woff2 differ diff --git a/resources/public/fonts/open-sans/open-sans-vietnamese.woff2 b/resources/public/fonts/open-sans/open-sans-vietnamese.woff2 new file mode 100644 index 000000000..9164ccba9 Binary files /dev/null and b/resources/public/fonts/open-sans/open-sans-vietnamese.woff2 differ diff --git a/resources/public/js/cookies.js b/resources/public/js/cookies.js index 4c96b92ed..85ebbb222 100644 --- a/resources/public/js/cookies.js +++ b/resources/public/js/cookies.js @@ -1,10 +1,5 @@ function Pop() { - var cssRuleFile = "/css/cookiestyles.css"; - let lnk = document.createElement("link"); - lnk.setAttribute("rel", "stylesheet"); - lnk.setAttribute("type", "text/css"); - lnk.setAttribute("href", cssRuleFile); - document.getElementsByTagName("head")[0].appendChild(lnk); + // Its stylesheet is linked by the page itself (index.clj), with the file's content stamp. let styl = "undefined"; var conDivObj; var fadeInTime = 10; diff --git a/src/clj/orcpub/config.clj b/src/clj/orcpub/config.clj index 326a9fb4b..c66005367 100644 --- a/src/clj/orcpub/config.clj +++ b/src/clj/orcpub/config.clj @@ -72,9 +72,9 @@ "CSP that allows same-origin scripts without strict-dynamic. Compatible with traditional