From 7097a330212b55007d0045218d43c16f3f11f24d Mon Sep 17 00:00:00 2001 From: XPoet Date: Tue, 10 Jan 2023 17:34:27 +0800 Subject: [PATCH 1/6] chore: update license in package.json --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 50ecffa..b2cab6a 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,10 @@ "private": false, "description": "A simple and elegant theme for Hexo.", "scripts": { - "npm:publish": "npm publish", "format": "prettier --write ./source/js/*.js ./scripts", "lint:style": "stylelint --fix ./source/css", "git:push": "git push --tag && git push -u origin dev", - "git:add": "npm run lint:style && git add ." + "git:add": "npm run format && npm run lint:style && git add ." }, "repository": { "type": "git", @@ -24,7 +23,7 @@ "powerful" ], "author": "XPoet", - "license": "GPL-3.0", + "license": "AGPL-3.0", "bugs": { "url": "https://github.com/XPoet/hexo-theme-keep/issues" }, From 6e366f04960a312f9f6ced35725dd955433273a5 Mon Sep 17 00:00:00 2001 From: XPoet Date: Tue, 10 Jan 2023 17:42:57 +0800 Subject: [PATCH 2/6] docs: update documents --- README.md | 10 ++++++---- docs/README_zh-CN.md | 10 ++++++---- docs/README_zh-TW.md | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1b768c7..303be46 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@
Language: - English - 简中 - 繁中 + English | + 简体中文 | + 繁體中文
Keep @@ -103,5 +103,7 @@ This project exists thanks to all the people who contribute. ## :memo: License -[GPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) Copyright © 2020-present XPoet +[AGPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) + +Copyright © 2020-present XPoet diff --git a/docs/README_zh-CN.md b/docs/README_zh-CN.md index 94b780b..be9c05f 100644 --- a/docs/README_zh-CN.md +++ b/docs/README_zh-CN.md @@ -1,8 +1,8 @@
语言: - 简中 - English - 繁中 + 简体中文 | + English | + 繁體中文
Keep @@ -102,4 +102,6 @@ $ git pull ## :memo: 许可 -[GPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) Copyright © 2020-present XPoet +[AGPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) + +Copyright © 2020-present XPoet diff --git a/docs/README_zh-TW.md b/docs/README_zh-TW.md index e58bc36..01278e3 100644 --- a/docs/README_zh-TW.md +++ b/docs/README_zh-TW.md @@ -1,8 +1,8 @@
語言: - 繁中 - English - 简中 + 繁體中文 | + English | + 简体中文
Keep @@ -103,4 +103,6 @@ $ git pull ## :memo: 許可 -[GPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) Copyright © 2020-present XPoet +[AGPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) + +Copyright © 2020-present XPoet From a02282db692cd477eaaea951038349d27c159476 Mon Sep 17 00:00:00 2001 From: XPoet Date: Fri, 13 Jan 2023 10:19:04 +0800 Subject: [PATCH 3/6] style(home): rename post update date --- layout/_partial/home-article-meta-info.ejs | 7 ++----- source/js/utils.js | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/layout/_partial/home-article-meta-info.ejs b/layout/_partial/home-article-meta-info.ejs index fe3b8b6..74295d6 100644 --- a/layout/_partial/home-article-meta-info.ejs +++ b/layout/_partial/home-article-meta-info.ejs @@ -1,12 +1,9 @@ -<% -const target_date = post.date !== post.updated ? post.updated : post.date -%>
  - - <%= date(target_date, 'YYYY-MM-DD') %> + + <%= date(post.updated, 'YYYY-MM-DD') %> <% if (post.categories.length && theme.home_article.category.enable === true) { %> diff --git a/source/js/utils.js b/source/js/utils.js index ee2dd1e..b519ea4 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -295,7 +295,7 @@ KEEP.initUtils = () => { post && post.forEach((v) => { const nowDate = Date.now() - const postDate = new Date(v.dataset.date.split(' GMT')[0]).getTime() + const postDate = new Date(v.dataset.updated.split(' GMT')[0]).getTime() v.innerHTML = this.getHowLongAgo(Math.floor((nowDate - postDate) / 1000)) }) }, From 5ee42c0605b182b0210009cbd7693ebe8fb56b03 Mon Sep 17 00:00:00 2001 From: XPoet Date: Fri, 13 Jan 2023 10:49:27 +0800 Subject: [PATCH 4/6] style(article-content): rename `agingDays` -> `aging_days` --- layout/article-content.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/article-content.ejs b/layout/article-content.ejs index 49fb4e0..eaa03a2 100644 --- a/layout/article-content.ejs +++ b/layout/article-content.ejs @@ -33,7 +33,7 @@
<% if (page?.aging === true) { %> -
+
<%- __('article-aging', '0') %>
<% } %> From c1921cc851186a3bcf4e58841b3004649cbc97cb Mon Sep 17 00:00:00 2001 From: XPoet Date: Fri, 13 Jan 2023 11:02:18 +0800 Subject: [PATCH 5/6] feat: front matter adds the `copyright_info` setting item (#196) --- layout/article-content.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layout/article-content.ejs b/layout/article-content.ejs index eaa03a2..5d2d64d 100644 --- a/layout/article-content.ejs +++ b/layout/article-content.ejs @@ -41,7 +41,9 @@ <%- page.content %>
- <% if (theme.post?.copyright_info === true || theme?.copyright_info?.enable === true) { %> + <% if ( + (theme.post?.copyright_info === true || theme?.copyright_info?.enable === true) && page?.copyright_info !== false + ) { %>
<%- partial('_partial/article-copyright-info') %>
From 6eae132421d802cd3b243fbc4583f1efbe345414 Mon Sep 17 00:00:00 2001 From: XPoet Date: Fri, 13 Jan 2023 11:03:28 +0800 Subject: [PATCH 6/6] chore(release): v3.6.1 --- _config.yml | 2 +- layout/_partial/footer.ejs | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index d6a2fea..ef81d97 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ ## ====================================================================================== -## Keep v3.6.0 +## Keep v3.6.1 ## Preview: https://xpoet.cn ## Documents: https://keep-docs.xpoet.cn ## Repository: https://github.com/XPoet/hexo-theme-keep diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs index 22ae789..200b348 100644 --- a/layout/_partial/footer.ejs +++ b/layout/_partial/footer.ejs @@ -34,7 +34,7 @@ const { site_uv: bsz_site_uv, site_pv: bsz_site_pv, enable: bsz_enable } = theme
<% } %>
- <%- __('powered_by', 'Hexo') %> | <%- __('theme') %> Keep v3.6.0 + <%- __('powered_by', 'Hexo') %> | <%- __('theme') %> Keep v3.6.1
<% if (f_icp) { %>
diff --git a/package.json b/package.json index b2cab6a..1957780 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-keep", - "version": "3.6.0", + "version": "3.6.1", "private": false, "description": "A simple and elegant theme for Hexo.", "scripts": {