Skip to content

Commit

Permalink
Merge pull request #1084 from rodekruis/develop
Browse files Browse the repository at this point in the history
v24.07.2
  • Loading branch information
elwinschmitz authored Jul 25, 2024
2 parents f23b1a9 + 9ccf263 commit 7524f95
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 79 deletions.
3 changes: 1 addition & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env sh

fnm use

npx lint-staged
lint-staged
1 change: 0 additions & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/env sh

fnm use

Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ This project uses the [`CalVer`](https://calver.org/#scheme)-format: `YY.0M.MICR

---

## [Unreleased](https://github.com/rodekruis/helpful-information/compare/v24.07.1...main)
## [Unreleased](https://github.com/rodekruis/helpful-information/compare/v24.07.2...main)

---

## 2024-07-25: [v24.07.2](https://github.com/rodekruis/helpful-information/releases/tag/v24.07.2)

### Fixed

- Auto-translations using (third-party) Google Translate require less strict security-settings.

---

Expand Down
130 changes: 65 additions & 65 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"ngx-markdown": "^18.0.0",
"rxjs": "^7.5.0",
"tslib": "^2.6.3",
"zone.js": "^0.14.7"
"zone.js": "^0.14.8"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.1.1",
Expand All @@ -62,8 +62,8 @@
"@types/eslint": "^8.56.10",
"@types/jasmine": "^5.1.4",
"@types/node": "^20.14.10",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^7.17.0",
"confusing-browser-globals": "^1.0.11",
"dotenv": "^16.4.5",
"eslint": "^8.57.0",
Expand All @@ -74,12 +74,12 @@
"eslint-plugin-no-loops": "^0.3.0",
"eslint-plugin-no-relative-import-paths": "^1.5.5",
"eslint-plugin-no-unsanitized": "^4.0.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-regexp": "^2.6.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"http-server": "^14.1.0",
"husky": "^9.0.11",
"husky": "^9.1.1",
"karma": "^6.4.3",
"karma-chrome-launcher": "^3.2.0",
"karma-coverage": "^2.2.1",
Expand Down
7 changes: 5 additions & 2 deletions src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -669,15 +669,18 @@ img[decoding='async'] {
/**
Overrides for Google Translate (in-page)
*/
// Make room for the Google Translate bar
body[style*='margin-top: 56px;'] {
margin-top: 0 !important;
background-position-y: 56px;

ion-app {
top: 56px;
}

// Hide own language-switcher when Google's is active
}
// Hide own language-switcher when Google's is active
body[style*='margin-top: 0px;'],
body[style*='margin-top: 56px;'] {
.language-switcher {
display: none;
}
Expand Down
1 change: 0 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<link rel="manifest" href="manifest.json" />
<meta name="theme-color" content="#ffffff" />
<meta name="referrer" content="same-origin" />
<meta http-equiv="content-security-policy" content="default-src * 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src * 'self' data:; font-src 'self' data:; object-src 'none'; frame-src 'none'; form-action 'none'; manifest-src 'self'" />
<meta http-equiv="cross-origin-opener-policy" content="same-origin" />
<meta http-equiv="permissions-policy" content="document-domain=(), storage-access=(self), attribution-reporting=(), interest-cohort=(), browsing-topics=()" />
<meta http-equiv="referrer-policy" content="same-origin" />
Expand Down
1 change: 0 additions & 1 deletion staticwebapp.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
}
},
"globalHeaders": {
"Content-Security-Policy": "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src * 'self' data:; font-src 'self' data:; connect-src * 'self'; media-src * 'self'; object-src 'none'; frame-src 'none'; form-action 'none'; manifest-src 'self'",
"Cross-Origin-Opener-Policy": "same-origin",
"Permissions-Policy": "document-domain=(), storage-access=(self), attribution-reporting=(), interest-cohort=(), browsing-topics=()",
"Referrer-Policy": "same-origin"
Expand Down

0 comments on commit 7524f95

Please sign in to comment.