1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-16 03:06:27 +00:00

Merged branch master into master

This commit is contained in:
Dick Choi
2016-10-17 08:12:03 +09:00
3 changed files with 7 additions and 3 deletions

View File

@@ -34,7 +34,11 @@ mainWindow.webContents.sendInputEvent({
if (process.platform !== 'linux' || process.env.DESKTOP_SESSION === 'cinnamon') { if (process.platform !== 'linux' || process.env.DESKTOP_SESSION === 'cinnamon') {
mainWindow.on('close', function (e) { mainWindow.on('close', function (e) {
if (process.platform === 'win32') {
mainWindow.minimize()
} else {
mainWindow.hide() mainWindow.hide()
}
e.preventDefault() e.preventDefault()
}) })

View File

@@ -4,7 +4,7 @@
"react": "https://cdnjs.cloudflare.com/ajax/libs/react/15.0.2/react.js", "react": "https://cdnjs.cloudflare.com/ajax/libs/react/15.0.2/react.js",
"react-dom": "https://cdnjs.cloudflare.com/ajax/libs/react/15.0.2/react-dom.js", "react-dom": "https://cdnjs.cloudflare.com/ajax/libs/react/15.0.2/react-dom.js",
"redux": "https://cdnjs.cloudflare.com/ajax/libs/redux/3.5.2/redux.js", "redux": "https://cdnjs.cloudflare.com/ajax/libs/redux/3.5.2/redux.js",
"react-redux": "https://unpkg.com/react-redux@4.4.5/dist/react-redux.min.js" "react-redux": "https://unpkg.com/react-redux@4.4.5/dist/react-redux.min.js",
"katex": "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js", "katex": "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.js",
"katex-style": "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.css" "katex-style": "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.6.0/katex.min.css"
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "boost", "name": "boost",
"version": "0.6.8", "version": "0.7.0",
"description": "Boostnote", "description": "Boostnote",
"main": "index.js", "main": "index.js",
"license": "GPL-3.0", "license": "GPL-3.0",