Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #496 from littleskunk/electron
Browse files Browse the repository at this point in the history
update storj-lib and electron
  • Loading branch information
littleskunk authored Mar 2, 2017
2 parents 69dda56 + d1f8ecf commit b38ba48
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 3 additions & 1 deletion app/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ var about = new Vue({
data: {
version: about.version,
core: storj.version.software,
protocol: storj.version.protocol
protocol: storj.version.protocol,
electron: process.versions.electron,
chrome: process.versions.chrome
},
methods: {
show: function(event) {
Expand Down
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Storj Share",
"identifier": "com.storj.farmer",
"description": "Storj Share GUI",
"version": "4.0.11",
"version": "4.1.0",
"author": "Storj <[email protected]>",
"main": "main.js",
"config": {
Expand All @@ -30,7 +30,7 @@
"myspeed": "^1.0.1",
"request": "^2.63.0",
"semver": "^5.1.0",
"storj-lib": "^6.2.0",
"storj-lib": "^6.3.0",
"storj-telemetry-reporter": "^4.0.0",
"untildify": "^2.1.0",
"vue": "^1.0.10",
Expand Down
2 changes: 2 additions & 0 deletions app/storjshare.html
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,8 @@ <h4 class="modal-title">About Storj Share</h4>
<p>Storj Share {{version}}</p>
<p>Core Library {{core}}</p>
<p>Protocol {{protocol}}</p>
<p>Electron {{electron}}</p>
<p>Chrome {{chrome}}</p>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"asar": "^0.7.2",
"chai": "^3.4.1",
"coveralls": "^2.11.4",
"electron": "=1.4.4",
"electron": "=1.4.15",
"electron-mocha": "^3.1.1",
"fs-jetpack": "^0.7.0",
"gulp": "^3.9.0",
Expand All @@ -25,7 +25,7 @@
"rcedit": "^0.3.0"
},
"scripts": {
"postinstall": "node ./tasks/app_npm_install && cd ./app/node_modules/leveldown && node-gyp rebuild --target=1.4.4 --dist-url=https://atom.io/download/atom-shell",
"postinstall": "node ./tasks/app_npm_install && cd ./app/node_modules/leveldown && node-gyp rebuild --target=1.4.15 --dist-url=https://atom.io/download/atom-shell",
"app-install": "node ./tasks/app_npm_install",
"build": "./node_modules/.bin/gulp build",
"release": "./node_modules/.bin/gulp release --env=production",
Expand Down

0 comments on commit b38ba48

Please sign in to comment.