From 2f9ad442e8d930fd4b3441c08340f0a61a2a6212 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 9 Apr 2018 22:40:46 +0900 Subject: [PATCH 1/3] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 221e304a..6efd769b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Originally created as "electron-mattermost" by Yuya Ochiai. Developed using [Ele * Tabs for multiple teams across multiple servers * Desktop Notifications * Windows 10: Toast - * Windows 7-8.1: Balloon (fallback behavior, so lesser support) + * Windows 7-8.1: Popup like Toast * OS X: Notification Center * Linux: [libnotify](http://electron.atom.io/docs/v0.36.0/tutorial/desktop-environment-integration/#linux) * Badges for unread channels and mentions @@ -31,14 +31,13 @@ Detailed guides are available at [docs.mattermost.com](https://about.mattermost. 1. Download a file from the [downloads page](https://about.mattermost.com/downloads). 2. Launch `Mattermost` in the unarchived folder. -3. After first launching, please input name and URL for your Mattermost team. For example, `myteam : https://mattermost.example.com/team`. +3. After first launching, please input name and URL for your Mattermost server. For example, `myserver : https://mattermost.example.com`. ### Quit Ctrl or Command + Q to quit. ### Configuration You can show the dialog from menu bar. -(Please press Alt key to show the menu bar if it disappers.) Configuration will be saved into Electron's userData directory: @@ -56,6 +55,8 @@ Or you can set proxy by following command line options. * `--proxy-server=:` * `--proxy-pac-url=` +On Windows, please make sure adding `--` before options. For example, `Mattermost.exe -- --proxy-server=...`. + ## Contributing Please see [CONTRIBUTING.md](./CONTRIBUTING.md). From fb94c3d51fed689a99db8a84352040483dfc9884 Mon Sep 17 00:00:00 2001 From: amyblais Date: Mon, 9 Apr 2018 09:48:16 -0400 Subject: [PATCH 2/3] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6efd769b..670e593b 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,12 @@ Configuration will be saved into Electron's userData directory: Otherwise, you have to configure again.* ### Proxy -Normally, the application will follow your system settings to use proxy. -Or you can set proxy by following command line options. +Normally, the application will follow your system settings to use proxy, or you can set proxy by following command line options. * `--proxy-server=:` * `--proxy-pac-url=` -On Windows, please make sure adding `--` before options. For example, `Mattermost.exe -- --proxy-server=...`. +On Windows, please make sure to add `--` before options. For example, `Mattermost.exe -- --proxy-server=...`. ## Contributing Please see [CONTRIBUTING.md](./CONTRIBUTING.md). From c52c6affa58b1fe16eb212dc7902c7290c25c618 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Mon, 9 Apr 2018 09:55:49 -0400 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 670e593b..48147e16 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Detailed guides are available at [docs.mattermost.com](https://about.mattermost. 1. Download a file from the [downloads page](https://about.mattermost.com/downloads). 2. Launch `Mattermost` in the unarchived folder. -3. After first launching, please input name and URL for your Mattermost server. For example, `myserver : https://mattermost.example.com`. +3. On the first launch, please input name and URL for your Mattermost server. For example, `myserver : https://mattermost.example.com`. ### Quit Ctrl or Command + Q to quit. @@ -49,7 +49,7 @@ Configuration will be saved into Electron's userData directory: Otherwise, you have to configure again.* ### Proxy -Normally, the application will follow your system settings to use proxy, or you can set proxy by following command line options. +Normally, the application will follow your system settings to use a proxy, or you can set up a proxy by the following command line options. * `--proxy-server=:` * `--proxy-pac-url=`