Skip to content

Commit

Permalink
Merge branch 'release/3.66.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
purocean committed Jan 11, 2024
2 parents 2f31335 + 74dc2a6 commit 1e4e339
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-extra-non-null-assertion': 'off',
'@typescript-eslint/no-unused-vars': 'warn',
'standard/no-callback-literal': 'off',
'no-console': 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ For more information on how to use the following functions, please see [characte

## Changelogs

### [v3.66.0](https://github.com/purocean/yn/releases/tag/v3.66.0) 2024-01-11
### [v3.66.1](https://github.com/purocean/yn/releases/tag/v3.66.1) 2024-01-11

[Windows](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-win-x64-3.66.0.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-mac-arm64-3.66.0.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-mac-x64-3.66.0.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-linux-x86_64-3.66.0.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-linux-amd64-3.66.0.deb)
[Windows](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-win-x64-3.66.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-mac-arm64-3.66.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-mac-x64-3.66.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-linux-x86_64-3.66.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-linux-amd64-3.66.1.deb)

1. feat: Support [Github-style warning prompts](https://github.com/orgs/community/discussions/16925)
2. feat: Support displaying open windows in the Dock menu on macOS
Expand Down
4 changes: 2 additions & 2 deletions README_ZH-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@

## 更新日志

### [v3.66.0](https://github.com/purocean/yn/releases/tag/v3.66.0) 2024-01-11
### [v3.66.1](https://github.com/purocean/yn/releases/tag/v3.66.1) 2024-01-11

[Windows](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-win-x64-3.66.0.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-mac-arm64-3.66.0.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-mac-x64-3.66.0.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-linux-x86_64-3.66.0.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.66.0/Yank-Note-linux-amd64-3.66.0.deb)
[Windows](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-win-x64-3.66.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-mac-arm64-3.66.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-mac-x64-3.66.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-linux-x86_64-3.66.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.66.1/Yank-Note-linux-amd64-3.66.1.deb)

1. feat: 支持 [Github 风格的警告提示](https://github.com/orgs/community/discussions/16925)
2. feat: 在 macOS 上支持在 Dock 菜单中显示打开的窗口
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yank.note",
"version": "3.66.0",
"version": "3.66.1",
"description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
"main": "dist/main/app.js",
"license": "AGPL-3.0",
Expand Down
5 changes: 4 additions & 1 deletion src/main/menus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ export const getMainMenus = () => process.platform === 'darwin' ? Menu.buildFrom
]
},
// support multiple window
{ role: 'window', submenu: [] },
{
role: 'window',
submenu: [{ role: 'minimize' }, { role: 'close' }]
},
]) : null

export const getTrayMenus = () => Menu.buildFromTemplate([
Expand Down

1 comment on commit 1e4e339

@vercel
Copy link

@vercel vercel bot commented on 1e4e339 Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

yn-api-doc – ./

yn-api-doc.vercel.app
yn-api-doc-purocean.vercel.app
yn-api-doc-git-master-purocean.vercel.app

Please sign in to comment.