Commit graph

873 commits

Author SHA1 Message Date
Kolja Lampe 4f142f3e08 Bump some dev dependencies 2016-10-01 20:32:55 +02:00
Jimmy dc8e83d479 Update README.md
Updated the `README.md` based on suggestions from @it33
2016-10-01 18:26:08 +01:00
Yuya Ochiai 60aacd8725 Set release date for v3.4.1 2016-10-01 01:24:07 +09:00
Yuya Ochiai 84c8c7e2d6 Update version to 3.4.1 2016-10-01 01:24:07 +09:00
Yuya Ochiai a519d30fd9 Merge pull request #326 from yuya-oc/fix-window-popup
Fix the app window pops up second to foreground when a new message is received
2016-10-01 01:23:16 +09:00
Yuya Ochiai 73583b9675 Use naming "OS X" to be consistent with v3.4.0 2016-10-01 01:10:01 +09:00
Yuya Ochiai 55ccaf33cd Fix the app window pops up second to foreground when a new message is received 2016-09-29 23:43:10 +09:00
Martin c078d1f607 Use correct terminology for tray setting on Linux 2016-09-29 13:44:32 +01:00
Yuya Ochiai 1a7ff7c88f Update tests to stablize on local machines
makeSingleInstance test:
  On Windows, the test often fails, so skipped.

Window title test:
  Extend pause duration to wait updating title.
2016-09-29 19:42:55 +09:00
Martin f3f0f84db1 Fix the minimise to tray option never being enabled on Linux 2016-09-29 10:34:01 +01:00
Yuya Ochiai aa986afd05 Merge pull request #310 from yuya-oc/stop-docker
Stop using Docker and using Ubuntu 14.04 for this in CircleCI
2016-09-26 21:57:26 +09:00
Yuya Ochiai 3a8720a9bd Add docs/development.md 2016-09-25 19:45:52 +09:00
Yuya Ochiai b648d6acf8 Stop using Docker in CircleCI 2016-09-23 01:08:27 +09:00
Yuya Ochiai 9be484e3f9 Remove update-alternatives to use Ubuntu 14.04 2016-09-23 01:08:27 +09:00
Yuya Ochiai 566b983f92 Add horizontal lines for visibility of CHANGELOG.md 2016-09-22 23:30:40 +09:00
Yuya Ochiai d0b12fb2cf Add "UNDER DEVELOPMENT" section to CHANGELOG.md 2016-09-22 23:25:07 +09:00
Yuya Ochiai b244d1d3bf Merge branch 'release-3.4' 2016-09-22 22:30:08 +09:00
Yuya Ochiai 50c7a22aaa Update README.md 2016-09-22 22:21:17 +09:00
Jason Blais 13678811c3 Update CHANGELOG.md 2016-09-21 14:20:54 -04:00
Jason Blais 8074b7a974 Update CHANGELOG.md 2016-09-21 14:20:23 -04:00
Yuya Ochiai e28bcf6298 Merge pull request #296 from Razzeee/update-fix-autolaunch
Make sure our auto launch link is up do date
2016-09-21 21:05:24 +09:00
Kolja Lampe a8bfe709ba Make sure our auto launch link is up do date 2016-09-20 22:19:52 +02:00
Yuya Ochiai f96811e2c4 Merge pull request #295 from yuya-oc/disable-ctrl-shift-s
Disable search in current team `CTRL+SHIFT+S`
2016-09-20 01:43:26 +09:00
Yuya Ochiai 8dd5179d9d Merge pull request #294 from yuya-oc/fix-notification-shim
Fix Notification shim not working when clicking
2016-09-20 01:37:30 +09:00
Yuya Ochiai 985e8d3e0b Update docs/setup.md for #292 2016-09-20 01:26:21 +09:00
Yuya Ochiai 0c035693d0 Merge pull request #292 from mattermost/jasonblais-patch-1
Updates to menu bar
2016-09-20 01:24:53 +09:00
Yuya Ochiai 5b79384521 Disable search in current team CTRL+SHIFT+S
Due to #293
Revert when DM search works properly https://mattermost.atlassian.net/browse/PLT-91
2016-09-20 01:20:09 +09:00
Yuya Ochiai a1b7371c43 Fix Notification shim not working when clicking
Probably this was caused by upgrading Electron
2016-09-20 00:01:35 +09:00
Jason Blais 82408e8e29 Updates to menu bar
Proposed updates to menu bar:
 - Change 'Help > Mattermost Docs' to 'Help > Learn More' and link to newly submitted desktop docs on docs.mattermost.com [to be merged within the next 48 hours]
 - Change 'Settings' and 'Learn More' to include '...' as they open a new page. This is standard to other desktop apps
2016-09-19 09:21:56 -04:00
Yuya Ochiai a12ec194ad Merge pull request #290 from yuya-oc/fix-application-user-model-id
Fix ApplicationUserModelID in the start menu shortcut
2016-09-19 14:00:26 +09:00
Yuya Ochiai d199c6c8e2 Merge pull request #284 from asaadmahmood/PLT-4174
plt-4174 - Improvements to the Settings UI
2016-09-17 09:12:36 +09:00
Yuya Ochiai e8590e61d5 Fix ApplicationUserModelID in the start menu shortcut
The application expected "com.squirrel.mattermost.Mattermost"
due to electron-winstaller. But probably the package name,
"mattermost-desktop" was used when creating the shortcut.

This might affect the internal name of .deb package.

Close #287
2016-09-17 00:03:14 +09:00
Yuya Ochiai f32884c961 Fix wrong condition in npm run package 2016-09-16 20:24:27 +09:00
Jason Blais 346694b133 Update CHANGELOG.md
Turns out it has to be on `master` so we can link to it properly.
2016-09-16 01:47:09 -04:00
Jason Blais eb70e29cee Merge pull request #288 from mattermost/revert-286-jasonblais-patch-1
Revert "Update changelog for v1.4"
2016-09-16 01:46:01 -04:00
Jason Blais 0d31f8c2e7 Revert "Update changelog for v1.4" 2016-09-16 01:45:49 -04:00
Jason Blais 83d26e8344 Merge pull request #286 from mattermost/jasonblais-patch-1
Update changelog for v1.4
2016-09-16 01:45:24 -04:00
Jason Blais 1391390d5d Update CHANGELOG.md 2016-09-16 01:42:50 -04:00
Jason Blais 7ea7ed72c3 Fix typo 2016-09-14 20:49:22 -04:00
Jason Blais 01674d82a8 Update changelog for v1.4
This is just a text change for an .md file, so fine to add to `v3.4-release` branch.

It'll be included in RC2 (if cut) or the final build.
2016-09-14 08:22:51 -04:00
Yuya Ochiai bccb3a208d Update version to 3.4.0 2016-09-14 20:39:17 +09:00
Asaad Mahmood e38dd49d95 Updating styles for error page 2016-09-14 06:25:41 +05:00
Asaad Mahmood 2865ab395a Running prettify 2016-09-13 22:30:04 +05:00
Asaad Mahmood 06a9081f98 Removing unnecessary code from settings page 2016-09-13 22:12:32 +05:00
Asaad Mahmood acf969ccfa Pretifying settings 2016-09-13 21:35:11 +05:00
Asaad Mahmood 1fdb6f3964 PLT-4174 - Settings UI Improvements 2016-09-13 21:35:11 +05:00
Yuya Ochiai 7cfde1e379 Merge pull request #230 from Razzeee/hide-autostart
Hide on autostart
2016-09-14 01:04:01 +09:00
Jason Blais 5537caafa0 Merge pull request #282 from yuya-oc/fix-settings-padding
Add missing padding-bottom in Settings UI
2016-09-13 11:41:08 -04:00
Yuya Ochiai 7cc495130f Fix typo 2016-09-14 00:35:19 +09:00
Yuya Ochiai c4b4e2d95d Add missing padding-bottom in Settings UI
For #278
2016-09-14 00:19:01 +09:00