public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into windows

Browse Source 
Conflicts:
	browser/main/HomePage.js
	browser/main/HomePage/ArticleNavigator.js
	webpack.config.js
This commit is contained in:
Dick Choi
2015-12-15 13:06:01 +09:00
parent 1318abd37e 6b66893ea4
commit 2499a05473
51 changed files with 1310 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
package.json
View File

@@ -1,19 +1,21 @@
{
"name": "boost",
"version": "0.4.1-beta",
"version": "0.4.6",
"description": "Boost App",
"main": "main.js",
"main": "index.js",
"scripts": {
"start": "set BOOST_ENV=development&& electron ./main.js",
"webpack": "webpack-dev-server --hot --inline --config webpack.config.js",
"compile": "NODE_ENV=production webpack --config webpack.config.production.js",
"build": "electron-packager ./ Boost --app-version=$npm_package_version $npm_package_config_platform $npm_package_config_version $npm_package_config_ignore --overwrite",
"codesign": "codesign --verbose --deep --force --sign \"MAISIN solutions Inc.\" Boost-darwin-x64/Boost.app"
"pack:osx": "electron-packager ./ Boost --app-version=$npm_package_version $npm_package_config_platform $npm_package_config_version $npm_package_config_ignore --overwrite --out=\"dist\"",
"codesign": "codesign --verbose --deep --force --sign \"MAISIN solutions Inc.\" dist/Boost-darwin-x64/Boost.app",
"build:osx": "electron-builder \"dist/Boost-darwin-x64/Boost.app\" --platform=osx --out=\"dist\" --config=\"./builder-config.json\"",
"release": "electron-release --app=\"dist/Boost-darwin-x64/Boost.app\" --token=$(cat .env/.github-token) --repo=\"BoostIO/boost-releases\""
},
"config": {
"version": "--version=0.34.0 --app-bundle-id=com.maisin.boost",
"version": "--version=0.35.3 --app-bundle-id=com.maisin.boost",
"platform": "--platform=darwin --arch=x64 --prune --icon=resources/app.icns",
"ignore": "--ignore=Boost-darwin-x64 --ignore=node_modules/devicon/icons --ignore=submodules/ace/(?!src-min)|submodules/ace/(?=src-min-noconflict)"
"ignore": "--ignore=.env --ignore=Boost-darwin-x64 --ignore=node_modules/devicon/icons --ignore=submodules/ace/(?!src-min)|submodules/ace/(?=src-min-noconflict)"
},
"repository": {
"type": "git",
@@ -40,11 +42,12 @@
"devicon": "^2.0.0",
"font-awesome": "^4.3.0",
"fs-jetpack": "^0.7.0",
"highlight.js": "^8.9.1",
"lodash": "^3.10.1",
"markdown-it": "^4.3.1",
"markdown-it-emoji": "^1.1.0",
"md5": "^2.0.0",
"moment": "^2.10.3",
"node-notifier": "^4.2.3",
"socket.io-client": "^1.3.6",
"superagent": "^1.2.0",
"superagent-promise": "^1.0.3"
@@ -54,16 +57,16 @@
"babel-plugin-react-transform": "^1.1.1",
"css-loader": "^0.19.0",
"electron-packager": "^5.1.0",
"electron-prebuilt": "^0.33.6",
"electron-prebuilt": "^0.35.1",
"electron-release": "^2.2.0",
"nib": "^1.1.0",
"react": "^0.14.0",
"react-dom": "^0.14.0",
"react-redux": "^4.0.0",
"react-router": "^1.0.0-rc1",
"react-select": "^0.8.1",
"react-transform-catch-errors": "^1.0.0",
"react-transform-hmr": "^1.0.1",
"redbox-react": "^1.1.1",
"redbox-react": "^1.2.0",
"redux": "^3.0.2",
"standard": "^5.3.1",
"style-loader": "^0.12.4",