Skip to content

Commit

Permalink
Merge branch 'master' into preview
Browse files Browse the repository at this point in the history
  • Loading branch information
TrebledJ committed Nov 17, 2023
2 parents 3ed728c + c284e96 commit e6d4776
Show file tree
Hide file tree
Showing 26 changed files with 152 additions and 125 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
Expand All @@ -11,7 +11,7 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"

# Maintain dependencies for npm packages
- package-ecosystem: "npm"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
fi
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: ${{ steps.detect-package-manager.outputs.manager }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
1 change: 1 addition & 0 deletions .vscode/ltex.hiddenFalsePositives.en-GB.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@
{"rule":"ATD_VERBS_TO_COLLOCATION","sentence":"^\\QThis seems to be a total oddball, as tries don't usually have such a function.\\E$"}
{"rule":"MORFOLOGIK_RULE_EN_GB","sentence":"^\\Q{% details \"TrieNode Constructor: Possible Solution\" %}\\E$"}
{"rule":"DT_JJ_NO_NOUN","sentence":"^\\QProbably a boolean.\\E$"}
{"rule":"ATD_VERBS_TO_COLLOCATION","sentence":"^\\Q\\E(?:Dummy|Ina|Jimmy-)[0-9]+\\Q seems to be a total oddball, as tries don't usually have such a function.\\E$"}
2 changes: 1 addition & 1 deletion _includes/post/metadata.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="d-flex flex-row align-items-center">
{% block post_metadata_updated %}
{% set updatedDate = lastContentCommit | maxDate(updated) %}
{% if updatedDate and updatedDate != page.date %}
{% if updatedDate and (updatedDate | date) != (page.date | date) %}
<span class="post-updated-date-icon">
<i class="fa fa-calendar post-meta-icon me-1"></i>
</span>
Expand Down
24 changes: 12 additions & 12 deletions content/pages/postlike/privacy-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ related:
We collect the following personal data:

* **Technical Data**: IP address, Browser type, Device type, Referrer data.
* This is collected by GitHub Pages, Cloudflare Web Analytics, Disqus, and jsDelivr.
* This is collected by Cloudflare Pages, Cloudflare Web Analytics, Disqus, and jsDelivr.
* {{ site.title }} will only access such data in aggregate forms, and thus won't (be able to) link this data back to you.
* This data is provided automatically by your browser when you load a web page. A VPN may be used to suppress or hide such data.
* **Cookies**
* This is data associated with you and may be used by third-party services to track you.
* Used by Disqus and SoundCloud embeds.
* Cloudflare and jsDelivr claim they don't use cookies. ([Cloudflare](https://www.cloudflare.com/web-analytics/#:~:text=Cloudflare%20Web%20Analytics%20does%20not,the%20purpose%20of%20displaying%20analytics.); [jsDelivr](https://www.jsdelivr.com/terms/privacy-policy-jsdelivr-net#:~:text=We%20do%20not%20use%20cookies))
* Used by Cloudflare Pages^[Cloudflare Pages may use cookies to combat spam and malicious activity. See their [cookie policy](https://www.cloudflare.com/cookie-policy/).], Disqus, and SoundCloud embeds.
* Cloudflare *Analytics* and jsDelivr claim they don't use cookies. ([Cloudflare](https://www.cloudflare.com/web-analytics/#:~:text=Cloudflare%20Web%20Analytics%20does%20not,the%20purpose%20of%20displaying%20analytics.); [jsDelivr](https://www.jsdelivr.com/terms/privacy-policy-jsdelivr-net#:~:text=We%20do%20not%20use%20cookies))
* **Identity Data**: Name, Email address.
* In the [Contact Form][contact-form], these are **optional** fields. You have the discretion to *not* fill in those fields.
* In Disqus guest commenting, these are **mandatory** fields.
Expand Down Expand Up @@ -62,19 +62,19 @@ For your reference, here is a collection of third-party services we use and thei

{% table %}

| Service | Purpose | Technical Data[^u] | Identity Data[^u] | Cookies[^u] | Privacy Policy |
|-----------------|--------------|:------------------:|:-----------------:|:-----------:|------------------------------------|
| GitHub Pages | Hosting || | | [Link][pghp] |
| jsDelivr | CDN || | | [Link][pjsd] |
| Cloudflare | Analytics || | | [Link][pclf] (*End Users*) |
| Disqus[^disqus] | Comments ||[^dq1] || [Link][pdqs] |
| SoundCloud | Music Embeds ||[^sc1] || [Link][pscl] (*SoundCloud Widget*) |
| Getform | Forms ||[^gf1] |[^gf2] | [Link][pgfm] (*Respondents*) |
| Service | Purpose | Technical Data[^u] | Identity Data[^u] | Cookies[^u] | Privacy Policy |
|-----------------|-------------------------|:------------------:|:-----------------:|:-------------------:|------------------------------------|
| Cloudflare | Hosting, CDN, Analytics || | √ (See [CP][cclf].) | [Link][pclf] (*End Users*) |
| jsDelivr | CDN || | | [Link][pjsd] |
| Disqus[^disqus] | Comments ||[^dq1] || [Link][pdqs] |
| SoundCloud | Music Embeds ||[^sc1] || [Link][pscl] (*SoundCloud Widget*) |
| Getform | Forms ||[^gf1] |[^gf2] | [Link][pgfm] (*Respondents*) |

{% endtable %}

[pghp]: https://docs.github.com/en/pages/getting-started-with-github-pages/about-github-pages#data-collection
[pjsd]: https://www.jsdelivr.com/terms/privacy-policy-jsdelivr-net
[cclf]: https://www.cloudflare.com/cookie-policy/
[pclf]: https://www.cloudflare.com/privacypolicy
[pdqs]: https://help.disqus.com/en/articles/1717103-disqus-privacy-policy
[pscl]: https://soundcloud.com/pages/privacy
Expand All @@ -86,7 +86,7 @@ For your reference, here is a collection of third-party services we use and thei
[^gf1]: Applicable if filled in.
[^gf2]: Applicable when redirected to getform.io.

- GitHub Pages, jsDelivr, and Cloudflare are present on all HTML pages of our site.
- Cloudflare and jsDelivr are present on all HTML pages of our site.
- Disqus will only be loaded on posts which allow comments, and when the page is scrolled down far enough.
- SoundCloud embeds are only loaded on relevant pages (music pages, home page, etc.).
- Getform only applies to pages containing forms (e.g. the contact form).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ excerpt: Frequency analysis with a touch of heuristics.
tags:
- cryptography
- python
- hkcert-ctf
thumbnail_src: assets/hkcert22-thumbnail.jpg
useMath: true
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ excerpt: A harming website? Hope it doesn't harm my sleep!
tags:
- reverse
- cpp
- hkcert-ctf
thumbnail_src: assets/hkcert22-thumbnail.jpg
---

Expand Down
Loading

0 comments on commit e6d4776

Please sign in to comment.