Commit graph

111 commits

Author SHA1 Message Date
Yuya Ochiai 5841231477 Suppress the second icon on OS X notification for #151 2016-06-08 00:45:10 +09:00
Yuya Ochiai 479b789629 Merge branch 'master' into dev 2016-06-06 21:30:23 +09:00
Yuya Ochiai 20d94a5985 Merge pull request #158 from Razzeee/improve-tray
Change tooltip text on mentions/unread
2016-06-05 20:19:37 +09:00
Kolja Lampe a2713885ab Improved badge descriptions 2016-06-04 01:41:15 +02:00
Yuya Ochiai 20450916f9 Merge pull request #152 from MetalCar/editTeamsInSettings
Edit teams in settings window
2016-06-04 01:46:31 +09:00
Carmine D'Amico 9677607ae4 move "Add Team"-Button nearer to the "Teams" headline 2016-06-03 18:21:15 +02:00
Yuya Ochiai bd25d254d3 Merge branch 'release/v1.2.1' 2016-06-01 23:04:40 +09:00
Carmine D'Amico 186c520ab1 BUGFIX: fixed a problem with state, when editing first a team and then add a new one 2016-05-31 15:27:14 +02:00
Carmine D'Amico 712cff2680 changed jsx code to a better code style 2016-05-25 23:19:36 +02:00
Carmine D'Amico c0e5cbd9ef run prettify on code 2016-05-25 22:36:59 +02:00
Carmine D'Amico 510f49a99b editing teams is possible now 2016-05-25 22:36:54 +02:00
Carmine D'Amico 7f52e0caec changed the way how to add a new team 2016-05-25 22:36:43 +02:00
Yuya Ochiai 7c964d51f5 Add dialog to confirm non-http(s) link 2016-05-22 13:39:52 +09:00
Kolja Lampe 20e7f90bae Use a fitting border color for the taskbar badge status 2016-05-21 20:58:59 +02:00
Yuya Ochiai a4f119bcae Update menu when the config is updated 2016-05-21 16:13:22 +09:00
Yuya Ochiai ab9bfad73a Keep zoomLevel after reloading
Knwon issue: rendered webview has incorect region until the window is
resized.
2016-05-21 15:23:42 +09:00
Kolja Lampe 273bf35dbc Use different colors for unread/mentioned in windows task bar. Like we do for tray icons. 2016-05-20 23:15:15 +02:00
Yuya Ochiai be69b8f502 Add shortcuts to control zoom level
TODO: Keep zoom level when reloading
2016-05-21 03:06:38 +09:00
Yuya Ochiai 0bb56291ed Add shortcuts to select next/previous tab 2016-05-19 00:29:23 +09:00
Yuya Ochiai 8f936c1725 Add Ctrl+n shortcut to switch tab
This also shows the main window.
Close #51
2016-05-18 23:02:03 +09:00
Yuya Ochiai 4fb0bf67ba Merge pull request #128 from jnugh/linuxTrayIcon
Manually merged.
Conflicts:
	src/browser/settings.jsx
	src/common/settings.js
2016-05-17 21:41:07 +09:00
Yuya Ochiai aefc91a53f Add a missing bracket 2016-05-13 22:09:36 +09:00
JoramWilander ef599deab3 Update text for allowing http content, allow mixed content by default 2016-05-13 08:49:33 -04:00
Jonas Schwabe ecfa143526 Add tray icon theme settings to the settings dialog 2016-05-08 01:01:56 +02:00
Jonas Schwabe 5020031235 Add tray icon for linux (Ubuntu ambiance style for now). 2016-05-07 22:21:17 +02:00
Yuya Ochiai a199f09216 Add tests for hideMenuBar 2016-05-03 00:42:13 +09:00
Yuya Ochiai 447c84578a Add "key" attribute to suppress warning 2016-05-02 20:21:51 +09:00
Yuya Ochiai 28dc6ac0d9 Merge branch 'feature/http-auth' into dev
Close #56
2016-04-27 21:52:36 +09:00
Yuya Ochiai 5fce592b01 Show proxy URL on login dialog 2016-04-27 20:48:01 +09:00
Yuya Ochiai 8c6a8f0338 Prettify previous commit 2016-04-26 22:40:21 +09:00
Yuya Ochiai 507889066a Tell whether the server is a proxy 2016-04-25 20:41:02 +09:00
Yuya Ochiai dc7e7181ec Allow only http and https to open a new window 2016-04-23 20:39:15 +09:00
Yuya Ochiai e051810ccc Improve codes to disable nodeIntegration 2016-04-23 20:37:57 +09:00
Yuya Ochiai d81856629b Send login credentials on Enter key 2016-04-23 19:15:25 +09:00
Yuya Ochiai b0a40c66fb Add the dialog to login 2016-04-23 01:12:00 +09:00
Yuya Ochiai 58f1ec5f9a Prototype http authentication 2016-04-21 23:29:44 +09:00
Yuya Ochiai 06ebee8299 Merge branch 'experiment/disablewebsecurity' into dev 2016-04-19 20:32:20 +09:00
Yuya Ochiai e1b008a3e0 Make "disablewebsecurity" optional 2016-04-17 23:07:17 +09:00
Yuya Ochiai 902c16b080 Disable nodeIntegration on window.open() 2016-04-17 22:11:01 +09:00
Yuya Ochiai 2eae1d42d2 Merge branch 'dev' into experiment/disablewebsecurity 2016-04-17 12:50:39 +09:00
Yuya Ochiai 3dd72b1aa1 Merge pull request #110 from asaadmahmoodspin/ui-improvements into dev 2016-04-14 22:35:41 +09:00
Yuya Ochiai c3783445fa Merge branch 'master' into dev 2016-04-14 21:21:52 +09:00
Asaad Mahmood 6e65cceb44 Updating notification styles
Pretifying changes
2016-04-14 05:49:24 +05:00
Yuya Ochiai 51fb43e1a1 Fix settings.html doesn't return to index.html
Reproduced when the path contains a blank.
Escape('%20') has no effects for this, so 'remote' module is used.

Close #89
2016-04-13 22:58:04 +09:00
Yuya Ochiai 8883ce3229 Make the tray icon to be optional 2016-04-11 21:51:24 +09:00
Yuya Ochiai 9e07f6213a Add the status menu for OS X 2016-04-07 00:49:20 +09:00
Yuya Ochiai 001a65f5eb Fix React.js warning by adding unique "key" prop 2016-03-30 23:05:24 +09:00
Yuya Ochiai ab18e33f7f Merge branch 'master' into release/v1.1.0 2016-03-22 23:24:04 +09:00
Yuya Ochiai babda10dc9 Merge pull request #79 from mattermost/rename-app
Rename electron-mattermost to Mattermost at implementation
Drop `v` from version name when releasing
2016-03-20 23:16:45 +09:00
Yuya Ochiai 072559a869 Merge pull request #71 from mattermost/testing-guide
Release Testing Guide proposal
2016-03-14 21:15:19 +09:00