Merge branch 'develop' into feature/features-api

.babelrc

@@ -1,19 +1,14 @@
 {
   "presets": [
-    [
-      "babel-preset-env",
-      {
-        "targets": {
-          "electron": "1.7.2"
-        }
-      }
-    ],
-    "babel-preset-react"
+    "@babel/env",
+    "@babel/react"
   ],
   "plugins": [
-    "transform-decorators-legacy",
-    "transform-flow-strip-types",
-    "transform-class-properties",
+    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+    "@babel/proposal-export-default-from",
+    ["@babel/proposal-class-properties", { "loose": true }],
+    "@babel/proposal-throw-expressions",
+    "@babel/syntax-dynamic-import"
   ],
   "sourceMaps": "inline"
 }

.eslintignore

@@ -1 +1,2 @@
 build/
+out/

.github/stale.yml

@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 365 # 1 year
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: -1 # Close the issue almost immediately. See: https://github.com/probot/stale/issues/131
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - blocker
+  - security
+
+# Label to use when marking an issue as stale
+staleLabel: "[Status] Stale"
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+  
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -7,3 +7,4 @@ build
 .stage
 .env
 yarn-error.log
+npm-debug.log*

.npmrc

@@ -0,0 +1 @@
+save-exact = true

.nvmrc

@@ -0,0 +1 @@
+10.13.0

.travis.yml

@@ -1,28 +1,28 @@
 matrix:
   include:
   - os: linux
-    dist: trusty
-    sudo: required
+    dist: xenial
+    addons:
+      apt:
+        packages:
+        - libx11-dev
+        - libxext-dev
+        - libxss-dev
+        - libxkbfile-dev
   - os: osx
     osx_image: xcode8.3
 
 language: node_js
 
 before_script:
-- yarn add global node-sass
-- yarn install
+- npm install node-sass -g
+- npm ci
 
 script:
-- yarn lint
-- travis_wait yarn build
+- npm run lint
+- travis_wait npm run build
 
-node_js:
-- '8'
-
-before_install:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi
-
-cache: yarn
+cache: npm
 
 notifications:
   email: false

.vscode/launch.json

@@ -9,7 +9,8 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "NODE_ENV": "development"
+                "NODE_ENV": "development",
+                "DEBUG": "*,-engine.io*,-socket.io*"
             }
         },
         {
@@ -18,9 +19,10 @@
             "name": "Franz – Live API",
             "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
             "program": "${workspaceFolder}/build/index.js",
-            "protocol": "inspector",
+            "protocol": "inspector",    
             "env": {
-                "LIVE_API": "1"
+                "LIVE_API": "1",
+                "DEBUG": "*,-engine.io*,-socket.io*"
             }
         },
         {
@@ -31,7 +33,47 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "LOCAL_API": "1"
+                "LOCAL_API": "1",
+                "DEBUG": "*,-engine.io*,-socket.io*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "(Win Sim) Franz - Test API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",
+            "env": {
+                "NODE_ENV": "development",
+                "OS_PLATFORM": "win32",
+                "DEBUG": "*,-engine.io*,-socket.io*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "(Win Sim) Franz – Live API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",    
+            "env": {
+                "LIVE_API": "1",
+                "OS_PLATFORM": "win32",
+                "DEBUG": "*,-engine.io*,-socket.io*"
+            }
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "(Win Sim) Franz – Local API",
+            "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+            "program": "${workspaceFolder}/build/index.js",
+            "protocol": "inspector",
+            "env": {
+                "LOCAL_API": "1",
+                "OS_PLATFORM": "win32",
+                "DEBUG": "*,-engine.io*,-socket.io*"
             }
         }
     ]

CHANGELOG.md

@@ -1,6 +1,75 @@
+<a name="5.0.0-beta.18"></a>
+# [5.0.0-beta.18](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.18) (2018-04-03)
+
+### General
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+### Features
+
+* **App:** Add option to enable/disable hardware acceleration ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
+
+### Bug Fixes
+
+* **Windows:** Fix shortcuts for closing, minimizing, quitting and toggling fullscreen ([f720d30](https://github.com/meetfranz/franz/commit/f720d30))
+* **Windows:** Hide title bar when in fullscreen ([655a6ed](https://github.com/meetfranz/franz/commit/655a6ed))
+
+
+<a name="5.0.0-beta.17"></a>
+# [5.0.0-beta.17](https://github.com/meetfranz/franz/compare/v5.0.0-beta.16...v5.0.0-beta.17) (2018-03-20)
+
+### General
+
+* **App:** Various performance improvements
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+### Features
+
+* **Windows:** Replace window frame with custom menu bar ([9af5fd0](https://github.com/meetfranz/franz/commit/9af5fd0))
+* **Electron:** Update electron to 1.8.4 ([b9c6616](https://github.com/meetfranz/franz/commit/b9c6616))
+* **Mac:** Add dock bounce when new update is available ([47885bb](https://github.com/meetfranz/franz/commit/47885bb))
+* **Services:** Improve performance when reordering services ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
+* **Translations:** Add option to translate error messages and system menus ([82e832c](https://github.com/meetfranz/franz/commit/82e832c))
+
+### Bug Fixes
+
+* **App:** Fix app reload when coming back from sleep ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+* **App:** Fix issue with app not showing services when recipe has invalid version (e.g. mailbox.org) ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+* **Linux:** Fix missing/flickering ubuntu tray icon ([592f00a](https://github.com/meetfranz/franz/commit/592f00a))
+* **Service Tabs:** Remove "delete service" context menu when not in development mode ([3a5c3f0](https://github.com/meetfranz/franz/commit/3a5c3f0))
+* **Windows:** Improve app window handling ([dd9f447](https://github.com/meetfranz/franz/commit/dd9f447))
+
+
+<a name="5.0.0-beta.16"></a>
+# [5.0.0-beta.16](https://github.com/meetfranz/franz/compare/v5.0.0-beta.15...v5.0.0-beta.16) (2018-02-23)
+
+### General
+* **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1))
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)**
+
+### Features
+* **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44))
+
+### Bug Fixes
+
+* **App:** Fix memory leak in recipe polling loop ([c99848f](https://github.com/meetfranz/franz/commit/c99848f))
+* **App:** Fix validation for side-by-side teamId & customURL ([bd51150](https://github.com/meetfranz/franz/commit/bd51150))
+* **App:** Reload Franz instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af))
+* **App:** Fix toggle buttons shown during import ([1220e2c](https://github.com/meetfranz/franz/commit/1220e2c))
+fix(App): Bugfix Fix memory leak in recipe polling loop
+* **App:** Fix invite screen [object Object] values ([81c4e99](https://github.com/meetfranz/franz/commit/81c4e99))
+* **App:** Fix Franz-wide form validation ([7618f51](https://github.com/meetfranz/franz/commit/7618f51))
+* **App:** Fix service tooltips not initialized properly ([8765b8f](https://github.com/meetfranz/franz/commit/8765b8f))
+* **Linux:** Invert tray icon color & add border for bright UI's ([0de9c60](https://github.com/meetfranz/franz/commit/0de9c60))
+
+
+
 <a name="5.0.0-beta.15"></a>
 # [5.0.0-beta.15](https://github.com/meetfranz/franz/compare/v5.0.0-beta.14...v5.0.0-beta.15) (2018-01-10)
 
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 ### Features
 
@@ -13,7 +82,6 @@
 * **Services:** Improve handling of external links ([e2d6edf](https://github.com/meetfranz/franz/commit/e2d6edf))
 * **Services:** Improve user experience of service search ([7e784c6](https://github.com/meetfranz/franz/commit/7e784c6))
 * **Account:** Enable a user to delete their own account ([1f3df73](https://github.com/meetfranz/franz/commit/1f3df73))
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
 
 
 
@@ -48,7 +116,7 @@
 * **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
 * **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
 * **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
-* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](http://i18n.meetfranz.com/)**
+* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)**
 
 
 ### Bug Fixes

CONTRIBUTING.md

@@ -33,4 +33,4 @@ As a basic rule, before filing issues, feature requests or anything else. Take a
 * When only changing documentation, include `[ci skip]` in the commit description
 
 ### Javascript
-* Please use `es-lint` and the defined rules to maintain a consistent style  
+* Please use `es-lint` and the defined rules to maintain a consistent style

README.md

@@ -5,7 +5,7 @@
 
 # Franz 5 (beta)
 [![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master)
- [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://meetfranz.com/payment.html)
+ [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://meetfranz.com/payment.html)
 
 Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.
 
@@ -20,34 +20,23 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor
 #### Install Linux OS dependencies
 [Guide: Linux distribution specific dependencies](docs/linux.md)
 
-#### Install yarn
-##### MacOS
-```bash
-$ brew install yarn
-```
-##### Windows
-[Download installer](https://yarnpkg.com/latest.msi)
-
-##### Linux
-[Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/)
-
 #### Fix native modules to match current electron node version
 ```bash
-$ yarn run rebuild
+$ npm run rebuild
 ```
 
 ### Run Franz Development App
 Run these two commands __simultaneously__ in different console tabs.
 
 ```bash
-$ yarn run dev
-$ yarn start
+$ npm run dev
+$ npm run start
 ```
 Be aware that the development database will be reset regularly.
 
 ## Packaging
 ```bash
-$ yarn build
+$ npm run build
 ```
 
 ## How can I support the project?
@@ -60,12 +49,5 @@ Join the Franz community on [Slack](http://slack.franz.im) and get in touch with
 You can find all the Information at the [Plugins repository](https://github.com/meetfranz/plugins).
 For questions feel free to ask in the [community Slack](http://slack.franz.im)
 
-## Next steps
-- [ ] Create acceptance tests
-- [ ] Create Linux build
-- [ ] 5.0 stable release
-- [ ] Developer Documentation
-- [ ] Add translations
-
 ## License
 Franz 5 is open-source licensed under the Apache-2.0 License.

appveyor.yml

@@ -9,18 +9,20 @@ environment:
 version: 5.0.0.{build}
 
 install:
-  - ps: Install-Product node 8
-  - yarn cache clean
-  - yarn install
+  - ps: $version = Get-Content .\.nvmrc -Raw 
+  - ps: Install-Product node $version
+  - npm ci
+  - node --version
+  - npm --version
 
-# cache:
-#  - "%LOCALAPPDATA%\\Yarn"
+cache:
+ - '%APPDATA%\npm-cache'
 
 before_build:
-  - yarn lint
+  - npm run lint
 
 build_script:
-  - yarn build --x64 --ia32
+  - npm run build
 
 notifications:
   - provider: Slack

electron-builder.yml

@@ -18,7 +18,11 @@ dmg:
 
 win:
   icon: ./build-helpers/images/icon.ico
-  target: nsis
+  target:
+    target: nsis
+    arch:
+    - x64
+    - ia32
 
 linux:
   icon: ./build-helpers/images/icons