Skip to content

Commit

Permalink
Merge branch 'develop' into add-snap
Browse files Browse the repository at this point in the history
* develop:
  dependencies upgrade
  dependencies upgrade
  dependencies upgrade
  Fix bug on some OS versions on about window, closes RocketChat#427
  Revert install path, close RocketChat#435
  Revert install path, close RocketChat#435
  dependencies upgrade
  • Loading branch information
engelgabriel committed May 9, 2017
2 parents 56e6441 + 05f43b8 commit 81db006
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "rocketchat-desktop",
"name": "rocketchat",
"productName": "Rocket.Chat+",
"description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
"version": "2.8.0-develop",
Expand Down Expand Up @@ -73,17 +73,17 @@
},
"dependencies": {
"@paulcbetts/system-idle-time": "^1.0.4",
"electron-updater": "^1.14.3",
"electron-updater": "^1.15.0",
"fs-jetpack": "^0.13.3",
"lodash": "^4.17.4",
"spellchecker": "^3.3.1"
},
"devDependencies": {
"chai": "^3.5.0",
"electron": "^1.6.6",
"electron-builder": "^17.1.2",
"electron-builder": "^17.3.1",
"electron-mocha": "^3.4.0",
"electron-rebuild": "^1.5.7",
"electron-rebuild": "^1.5.10",
"gulp": "^3.9.1",
"gulp-batch": "^1.0.5",
"gulp-less": "^3.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/background/autoUpdate.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function checkForUpdates () {
updateFile.autoUpdate = autoUpdate;
userDataDir.write(updateStoreFile, updateFile, { atomic: true });
} else if (autoUpdate === 'auto') {
e.returnValue = updateFile.autoUpdate;
e.returnValue = !!updateFile.autoUpdate;
} else {
checkForUpdatesEvent = e;
autoUpdater.checkForUpdates();
Expand Down

0 comments on commit 81db006

Please sign in to comment.