Merge pull request #1150 from Aluxian/deploy

Deploy

CHANGELOG.json

@@ -1,4 +1,30 @@
 [{
+  "version": "2.0.4",
+  "channel": "beta",
+  "releasedAt": 1483002596589,
+  "urgency": "low",
+  "changes": {
+    "General": [
+      "Remove custom context menu (temporarily) to fix crashes."
+    ],
+    "Windows": [
+      "Fix RightAlt+I opening dev tools."
+    ]
+  }
+}, {
+  "version": "2.0.3",
+  "channel": "beta",
+  "releasedAt": 1482919367144,
+  "urgency": "low",
+  "changes": {
+    "General": [
+      "Update Electron to v1.4.13."
+    ],
+    "Linux": [
+      "Remove special treatment for Elementary OS."
+    ]
+  }
+}, {
   "version": "2.0.1",
   "channel": "beta",
   "releasedAt": 1473193961005,
@@ -13,7 +39,7 @@
 }, {
   "version": "2.0.0",
   "channel": "beta",
-  "releasedAt": 1472106609428,
+  "releasedAt": 1472191336102,
   "urgency": "low",
   "changes": {
     "General": [

CHANGELOG.md

@@ -1,16 +1,40 @@
-## [2.0.1-beta](https://github.com/Aluxian/Facebook-Messenger-Desktop/tree/v2.0.1) (2016-06-09)
+## [2.0.4-beta](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.4) (2016-29-12)
 
-[Full Changelog](https://github.com/Aluxian/Facebook-Messenger-Desktop/compare/v2.0.0...v2.0.1) • [Download](https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/tag/v2.0.1)
+[Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.3...v2.0.4) • [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.4)
+
+**General**
+
+- Remove custom context menu (temporarily) to fix crashes.
+
+**Windows**
+
+- Fix RightAlt+I opening dev tools.
+
+## [2.0.3-beta](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.3) (2016-28-12)
+
+[Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.1...v2.0.3) • [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.3)
+
+**General**
+
+- Update Electron to v1.4.13.
+
+**Linux**
+
+- Remove special treatment for Elementary OS.
+
+## [2.0.1-beta](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.1) (2016-06-09)
+
+[Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.0...v2.0.1) • [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.1)
 
 **General**
 
 - Add toggle to auto-hide the sidebar.
 - Various fixes and improvements.
 - Dependency updates.
 
-## [2.0.0-beta](https://github.com/Aluxian/Facebook-Messenger-Desktop/tree/v2.0.0) (2016-25-08)
+## [2.0.0-beta](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.0) (2016-25-08)
 
-[Download](https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/tag/v2.0.0)
+[Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.0)
 
 **General**
 

README.md

@@ -1,18 +1,16 @@
 # Messenger for Desktop 2
 
-[![OS X build](https://travis-ci.org/Aluxian/Facebook-Messenger-Desktop.svg?branch=staging)](https://travis-ci.org/Aluxian/Facebook-Messenger-Desktop)
-[![Windows build](https://ci.appveyor.com/api/projects/status/9j09atict8yqvrsw/branch/staging?svg=true)](https://ci.appveyor.com/project/Aluxian/Facebook-Messenger-Desktop)
-[![Linux builds](https://circleci.com/gh/Aluxian/Facebook-Messenger-Desktop/tree/staging.svg?style=shield)](https://circleci.com/gh/Aluxian/Facebook-Messenger-Desktop)
+[![OS X build](https://travis-ci.org/Aluxian/Messenger-for-Desktop.svg?branch=staging)](https://travis-ci.org/Aluxian/Messenger-for-Desktop)
+[![Windows build](https://ci.appveyor.com/api/projects/status/2oar528hietbc77t/branch/staging?svg=true)](https://ci.appveyor.com/project/Aluxian/Messenger-for-Desktop)
+[![Linux builds](https://circleci.com/gh/Aluxian/Messenger-for-Desktop/tree/staging.svg?style=shield)](https://circleci.com/gh/Aluxian/Messenger-for-Desktop)
 [![Downloads total](https://updates.messengerfordesktop.com/badge/downloads.svg)](https://updates.messengerfordesktop.com/stats)
 [![Services status](https://img.shields.io/badge/services-status-blue.svg)](https://status.messengerfordesktop.com/)
-[![HuBoard task board](https://img.shields.io/badge/hu-board-7965cc.svg)](https://huboard.com/Aluxian/Facebook-Messenger-Desktop)
-[![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Aluxian/Facebook-Messenger-Desktop)
+[![HuBoard task board](https://img.shields.io/badge/hu-board-7965cc.svg)](https://huboard.com/Aluxian/Messenger-for-Desktop)
+[![Join the chat](https://badges.gitter.im/Join%20Chat.svg)][1]
 
 A simple & beautiful desktop client for [Facebook Messenger](https://www.messenger.com/). Chat without distractions on OS X, Windows and Linux. Not affiliated with Facebook. This is **NOT** an official product.
 
-> **@devs:** If you're willing to help improve, fix or maintain the app, I can make you a collaborator to help me. [Join me on Gitter](https://gitter.im/Aluxian/Facebook-Messenger-Desktop) and let's chat!
-
-<!--![MFD Screenshot](./screenshot.png)-->
+> **@devs:** If you're willing to help improve, fix or maintain the app, I can make you a collaborator to help me. [Join me on Gitter][1] and let's chat!
 
 ## Features
 
@@ -25,7 +23,7 @@ A simple &amp; beautiful desktop client for [Facebook Messenger](https://www.mes
 
 ## How to install
 
-**Note:** If you download from the [releases page](https://github.com/Aluxian/Facebook-Messenger-Desktop/releases), be careful what version you pick. Releases that end with `-beta` are beta releases, the ones that end with `-dev` are development releases, and the rest are stable. If you're unsure which to pick, opt for stable. Once you download the app, you'll be able to switch to another channel from the menu.
+**Note:** If you download from the [releases page](https://github.com/Aluxian/Messenger-for-Desktop/releases), be careful what version you pick. Releases that end with `-beta` are beta releases, the ones that end with `-dev` are development releases, and the rest are stable. If you're unsure which to pick, opt for stable. Once you download the app, you'll be able to switch to another channel from the menu.
 
 - **dev:** these releases get the newest and hottest features, but they are less tested and might break things
 - **beta:** these releases are the right balance between getting new features early while staying away from nasty bugs
@@ -70,7 +68,7 @@ sudo apt-key adv --keyserver pool.sks-keyservers.net --recv 6DDA23616E3FE905FFDA
 
 # Add my repository to your sources list (skip if you've done this already)
 # Replace <channel> with stable, beta or dev (pick stable if you're unsure)
-echo "deb https://dl.bintray.com/aluxian/deb <channel> main" |
+echo "deb https://dl.bintray.com/aluxian/deb/ <channel> main" |
   sudo tee -a /etc/apt/sources.list.d/aluxian.list
 
 # Install Messenger for Desktop
@@ -104,11 +102,11 @@ sudo yum install messengerfordesktop.x86_64   # for 64-bit distros
 
 Repository URL: https://aur.archlinux.org/packages/messengerfordesktop/
 
-[LR]: https://github.com/Aluxian/Facebook-Messenger-Desktop/releases
+[LR]: https://github.com/Aluxian/Messenger-for-Desktop/releases
 
 # For Developers
 
-Contributions are welcome! Please help me make *Messenger for Desktop* the best app for Facebook Messenger. For feature requests and bug reports please [submit an issue](https://github.com/Aluxian/Facebook-Messenger-Desktop/issues/new?labels=bug) or get in touch with me on [Gitter](https://gitter.im/Aluxian/Facebook-Messenger-Desktop) or Twitter [@aluxian](https://twitter.com/aluxian).
+Contributions are welcome! Please help me make *Messenger for Desktop* the best app for Facebook Messenger. For feature requests and bug reports please [submit an issue](https://github.com/Aluxian/Messenger-for-Desktop/issues/new?labels=bug) or get in touch with me on [Gitter][1] or Twitter [@aluxian](https://twitter.com/aluxian).
 
 ## Build
 
@@ -256,3 +254,5 @@ Make sure you've installed [fpm](https://github.com/jordansissel/fpm).
 2. In order to build, push to `staging`. Every push to `staging` will make the CIs build the app and upload it to Bintray at [aluxian/artifacts](https://dl.bintray.com/aluxian/artifacts/staging/), available for testing.
 3. After a version is tested and is ready for release, push it to `deploy`. This will rebuild the app and upload it to GitHub, Bintray and other repositories.
 4. Now, the code is ready to be merged into `master`.
+
+[1]: https://gitter.im/Aluxian/Facebook-Messenger-Desktop

appveyor.yml

@@ -30,7 +30,7 @@ environment:
   SQUIRREL_UPDATES_URL:
     secure: BNlChGRei/OKFGO3EQIc2yVSlm11vzsw/Uz65zjTUw4Ir3FfSlHOY02WMhPBI6Su
   IS_IC_FUSION_STR_AUTH_KEY:
-    secure: pvzSRQOpU6vFJmJohnjxXLTL9a8hSaHpRq051AUAms39EhrMtH8HhTtlDceSDRNJGthWvDD7S5+R8XAIWH+K39G6wushNDMhsnQjNk4JvRc2IXz3LH0gPsHJ0vcoxPJkMx58Ws/1O3NC4ec2QO5LDlD/uO9JX6O9oe3YC91ehUyWKszpFTwCBfWUg5LbO1X1hbx/DfZibR9GLz0GrPTzCC1Cbxhk5MeIXZyaRVlz6K33UJzQkutZaIG3p1j0FV8cDVwwuneoDvtvGYSrEl/OudI+BGPQbvRausx+uW+RRunujxrBHSmwTTZ1gDft5JEYUfeIM7je33oGbBa8KgXAkhm2E9pn1mJD/0Gcp60jViuKcW+ib9FSvSE6HOAumz6t
+    secure: Nyl2MrQfsmP8som8z+I7xegL97zfWP3GHY071fbwL84AyQOjykewmJ29SrwQS9j2U+OdMZVaHb7p5D56svi4DYDee9tZp6hDnLJENvlFgAK+TUPxBjdQf1RCtLvyMXBkuqKcJkvr95XU1l06Zr3UQ77MnHyqJZh5BKH+14F0/YSI2MqN0iM9SLmPolU6mzMw/IKhzRxuOIKB7rKONuHwsr501t0Pd/EH3PsRg3B6X9FnrPi0FAj7ctJTnF3lwTO02hJKQqda0n6px6byJxQl37X4ULgQ1qHEVrC+YOUuciISj1TE/OT+XqzAjewPM6zgxKu//qHQcUJu85+NcPuLvEXKceG3vjV0lNnVQbyrtRbokVtESgBjwzfWifyiFdF6
 
 cache:
   - "node_modules -> package.json"

package.json

@@ -1,46 +1,46 @@
 {
   "name": "messengerfordesktop",
   "dependencies": {
-    "asar": "0.12.3",
-    "async": "2.0.1",
+    "asar": "0.12.4",
+    "async": "2.1.4",
     "babel-plugin-default-import-checker": "1.0.8",
     "babel-plugin-transform-runtime": "6.15.0",
-    "babel-preset-es2015": "6.14.0",
-    "babel-preset-stage-0": "6.5.0",
-    "beeper": "1.1.0",
-    "coffee-script": "1.10.0",
+    "babel-preset-es2015": "6.18.0",
+    "babel-preset-stage-0": "6.16.0",
+    "beeper": "1.1.1",
+    "coffee-script": "1.12.2",
     "colors": "1.1.2",
-    "cross-spawn": "4.0.0",
+    "cross-spawn": "5.0.1",
     "del": "2.2.2",
     "electron-windows-installer": "1.4.4",
-    "fs-extra-promise": "0.4.0",
+    "fs-extra-promise": "0.4.1",
     "gulp": "3.9.1",
     "gulp-babel": "6.1.2",
     "gulp-electron-downloader": "0.1.6",
     "gulp-filter": "4.0.0",
-    "gulp-github-release": "1.2.0",
+    "gulp-github-release": "1.2.1",
     "gulp-header": "1.8.8",
-    "gulp-if": "2.0.1",
-    "gulp-less": "3.1.0",
-    "gulp-mustache": "2.2.0",
+    "gulp-if": "2.0.2",
+    "gulp-less": "3.3.0",
+    "gulp-mustache": "2.3.0",
     "gulp-plumber": "1.1.0",
     "gulp-rename": "1.2.2",
-    "gulp-sourcemaps": "1.6.0",
+    "gulp-sourcemaps": "1.9.1",
     "gulp-zip": "3.2.0",
-    "moment": "2.14.1",
+    "moment": "2.17.1",
     "rcedit": "0.7.0",
-    "request": "2.74.0",
-    "require-dir": "0.3.0"
+    "request": "2.79.0",
+    "require-dir": "0.3.1"
   },
   "devDependencies": {
     "babel-eslint": "6.1.2",
-    "coffeelint": "1.15.7",
-    "eslint": "3.4.0",
+    "coffeelint": "1.16.0",
+    "eslint": "3.12.2",
     "eslint-config-standard": "5.3.5",
     "eslint-plugin-babel": "3.3.0",
     "eslint-plugin-promise": "2.0.1",
-    "eslint-plugin-standard": "2.0.0",
-    "lesshint": "2.1.0"
+    "eslint-plugin-standard": "2.0.1",
+    "lesshint": "2.4.0"
   },
   "optionalDependencies": {
     "appdmg": "0.4.5"
@@ -57,11 +57,11 @@
   "homepage": "https://messengerfordesktop.com/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Aluxian/Facebook-Messenger-Desktop.git",
+    "url": "https://github.com/Aluxian/Messenger-for-Desktop.git",
     "aur": "ssh+git://[email protected]/messengerfordesktop.git"
   },
   "icon": {
-    "url": "https://raw.githubusercontent.com/Aluxian/Facebook-Messenger-Desktop/master/resources/win/app.ico"
+    "url": "https://raw.githubusercontent.com/Aluxian/Messenger-for-Desktop/master/resources/win/app.ico"
   },
   "bintray": {
     "subject": "aluxian",
@@ -70,6 +70,6 @@
     "gpgpub": "6DDA23616E3FE905FFDA152AE61DA9241537994D"
   },
   "bugs": {
-    "url": "https://github.com/Aluxian/Facebook-Messenger-Desktop/issues"
+    "url": "https://github.com/Aluxian/Messenger-for-Desktop/issues"
   }
 }

resources/win/FusionSdk.nsh

@@ -13,13 +13,14 @@
 !include FileFunc.nsh
 !include LogicLib.nsh
 !include WinMessages.nsh
+!include WinVer.nsh
 !insertmacro GetParameters
 
 /******************************************************************************* 
                               Fusion Definitions 
 *******************************************************************************/
 # DO NOT CHANGE - this value must be identical to Fusion.dll version
-!define FUSION_SDK_VERSION "1.461"  
+!define FUSION_SDK_VERSION "1.47"  
 
 # Fusion dll functions ordinal numbers
 !define FUS_InitDll 1
@@ -272,8 +273,16 @@ Function _AdjustFusWinSize
 	; Reposition window in the lower left
 	; Create RECT struct
 	System::Call "*${stRECT} .r1"
-	; Find Window info for the window we're displaying
-	System::Call "User32::GetWindowRect(i, i) i ($_gl_FUS_OffersWinHWND, r1) .r2"
+
+	!ifdef NSIS_UNICODE
+	${If} ${AtLeastWinVista}
+	!endif
+		; Find Window info for the window we're displaying
+		System::Call "User32::GetWindowRect(i, i) i ($_gl_FUS_OffersWinHWND, r1) .r2"
+	!ifdef NSIS_UNICODE
+	${EndIf}
+	!endif
+
 	; Get left/top/right/bottom
 	System::Call "*$1${stRECT} (.r2, .r3, .r4, .r5)"
 
@@ -366,7 +375,10 @@ FunctionEnd
 	${Else}
 		!insertmacro _UpdateMainProductValues
 	${EndIf}	
-	Pop $0		
+	Pop $0
+
+	Call _AdjustFusWinSize
+	!insertmacro _CallFusAPIFunc ${FUS_SetOffersWindow} "(i 0, i $_gl_FUS_OffersWinX,  i $_gl_FUS_OffersWinY, i $_gl_FUS_OffersWinWidth, i $_gl_FUS_OffersWinHeight)"
 !macroend
 /*******************************************************************************/
 !macro FusionOffersPage