phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into HideWindowOnMinimize

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Martin Gondermann
2016-07-03 16:14:30 +02:00
parent 2b4ee5f0bc 8637177c57
commit a1155bf989
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@
#### Windows #### Windows
- Fixed the pixelated app icon on the top left of the window. - Fixed the pixelated app icon on the top left of the window.
- Fixed the blurred tray icon. - Fixed the blurred tray icon.
- Fixed that the redundant description appears in the pinned start menu on Windows 7.
- The main window is now minimized to system tray on close - The main window is now minimized to system tray on close
- Added Option to toggle minimize/restore on click on system tray icon - Added Option to toggle minimize/restore on click on system tray icon

5
CONTRIBUTING.md
View File

@@ -31,8 +31,9 @@ Please see http://www.mattermost.org/feature-requests/ .
Pull requests are welcome. Thank you for your great work! Pull requests are welcome. Thank you for your great work!
1. When you edit the code, please run `npm run prettify` to format your code before `git commit`. 1. When you edit the code, please run `npm run prettify` to format your code before `git commit`.
2. In the description of your pull request, please include: 2. Please update `CHANGELOG.md` and `docs/*.md` if it's necessary.
3. In the description of your pull request, please include:
* Operating System version on which you tested * Operating System version on which you tested
* Mattermost server version on which you tested * Mattermost server version on which you tested
* New or updated unit tests for your changes * New or updated unit tests for your changes
3. Please complete the [Mattermost CLA](http://www.mattermost.org/mattermost-contributor-agreement/) prior to submitting a PR. 4. Please complete the [Mattermost CLA](http://www.mattermost.org/mattermost-contributor-agreement/) prior to submitting a PR.