aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity
1248 commits 1 branch 94 tags 43 MiB
Commit graph

355 commits

Author SHA1 Message Date
Yuya Ochiai 3e2d6be87e Merge pull request #201 from Razzeee/unread-badge 
Make unread badge configurable
 2016-08-01 12:17:25 +09:00
Kolja Lampe 51d828aa1a Make unread badge configurable 2016-07-28 18:00:15 +02:00
Yuya Ochiai bd354f21a5 Merge pull request #216 from Razzeee/align-unread-tabbar 
Bold unread tabitem if there are unread messages
 2016-07-28 23:02:00 +09:00
Yuya Ochiai 3feb833537 Refresh the inside of the current tab when reloading in the main window 
For #213 and #223

As the side effect, this doesn't reload the settings page.
But it will not be problem in most cases.
 2016-07-28 22:57:30 +09:00
Kolja Lampe 54849d6859 Added two security improvements as mentioned at http://electron.atom.io/docs/all/#checklist 2016-07-24 22:44:38 +02:00
Kolja Lampe 8c8df7086e Align unread tabbar to current display on task bar 2016-07-24 21:57:47 +02:00
Yuya Ochiai 74f78a918c Fix Windows 10 desktop notifications have black Mattermost logo 
Electron can't know the background color of Windows 10.
So replace the icon with resources/appicon.png in override of notification.js.

Close #218
 2016-07-24 22:26:28 +09:00
Jonas Schwabe 028d0ac7f8 implements #122, urgent hint on linux 2016-07-23 14:03:53 +02:00
Jonas Schwabe 54f6447712 Implements #176 2016-07-17 14:15:14 +02:00
Yuya Ochiai 88f7bf20ca Revert "Merge pull request #145 from Razzeee/align-taskbar-to-trayicon" 
This reverts commit 8d4f725556, reversing
changes made to 81bc16ca6e.

For #194
 2016-07-13 01:22:03 +09:00
Yuya Ochiai 227bda3a93 Fix authentication dialog not working for proxy 2016-07-13 00:41:31 +09:00
Kolja Lampe 58687c955c Improved settings casing 2016-07-11 23:17:31 +02:00
Kolja Lampe ffb61c2c7c Rephrased wording of a setting 
https://github.com/mattermost/desktop/issues/193#issuecomment-231553779
 2016-07-11 23:14:49 +02:00
Yuya Ochiai b13a5ab687 Fix that the hidden main window doesn't appear when clicking toast notifications in Windows 10 
Only in Windows 10, focus() was used to keep aero snap state.
 2016-07-07 22:37:37 +09:00
Yuya Ochiai ad7f63127f Add feature to hide window into system tray in Linux 2016-07-06 22:31:35 +09:00
Yuya Ochiai f8194f80c1 Merge pull request #179 from magicmonty/HideWindowOnMinimize 
Hide window to system tray on minimize/close in Windows/OSX
 2016-07-04 22:56:21 +09:00
Martin Gondermann 04cbec9a5d Makes the check for the tray icon a bit more lightweight 2016-07-03 23:04:36 +02:00
Martin Gondermann 3c0c448502 Fix behaviour, if "Show icon on menu bar" was previously not selected 2016-07-03 22:13:48 +02:00
Yuya Ochiai 17949d34ae Reset team edit form on clicking edit button 2016-07-04 00:12:58 +09:00
Yuya Ochiai 19134b08b0 Fix team edit form is not closed after submitting changes 2016-07-03 23:59:52 +09:00
Martin Gondermann 2b4ee5f0bc Readded the Option to hide the window on close for OSX 2016-07-03 16:12:04 +02:00
Martin Gondermann b3dd5e28e9 Reverted an obsolete change 2016-07-03 15:03:38 +02:00
Martin Gondermann 2919b1af5f Removed option to minimize to tray, this is now the default behaviour 2016-07-03 14:58:48 +02:00
Martin Gondermann 865b08105a OSX: Added Option to hide Window from dock on close 2016-06-30 22:17:31 +02:00
Martin Gondermann 0f6688b4cf The toggle setting is now independent of the "minimize to tray" setting 2016-06-30 18:04:05 +02:00
Martin Gondermann cdd1583e35 Match wording for minimize to tray with slack wording 2016-06-28 23:05:42 +02:00
Martin Gondermann 729f5a5511 Prettified results 2016-06-28 15:10:20 +02:00
Martin Gondermann 1f312e1f7f Add setting for "Toggle the window on tray icon click" 2016-06-28 15:07:29 +02:00
Martin Gondermann d6de73458c MinimizeToTray-Setting is only shown on Windows 2016-06-27 09:36:22 +02:00
Martin Gondermann db4bdd0a9b Window is hidden also on minimize and a click on the tray icon toggles the window 2016-06-27 09:06:20 +02:00
Yuya Ochiai 4fca00ec9d Add tests for settings 2016-06-23 00:03:04 +09:00
Yuya Ochiai 2347d5e299 Add tests for disablewebsecurity (Allow mixed contents) 2016-06-22 00:33:14 +09:00
Yuya Ochiai eda5d56d78 Refine headers and notifications config 2016-06-18 21:46:31 +09:00
Yuya Ochiai b91e44a5fe Prettify code 2016-06-18 20:40:12 +09:00
Yuya Ochiai 3650967f4c Fix that edited team is adeed to bottom of the list 2016-06-18 00:53:03 +09:00
Yuya Ochiai 96e52b6e85 Update config of main process when the config file is updated 2016-06-17 23:50:41 +09:00
Yuya Ochiai 517cc16835 Merge branch 'master' into dev 2016-06-17 23:39:45 +09:00
Yuya Ochiai 3061598935 Merge pull request #159 from MetalCar/blinkNotification 2016-06-17 21:29:12 +09:00
Yuya Ochiai 722807a5cb Refactor notification to simplify event handling 2016-06-16 23:01:37 +09:00
Kolja Lampe 447f6ec41d Adds a setting to launch the app on system login 2016-06-15 17:23:10 +02:00
Yuya Ochiai de5e6cf2ca Reload the tab after 30 sec when failed to load 
Close #127
 2016-06-13 23:55:26 +09:00
Yuya Ochiai f2e3b58e04 Fix obsolete 'shell' API 2016-06-12 22:56:22 +09:00
Carmine D'Amico 73a11ea398 added todo for idle notification and add a text to explain notification config 2016-06-07 22:42:36 +02:00
Carmine D'Amico 84d3c377b4 first implementation for flash notification and settings to configure these 2016-06-07 22:39:58 +02:00
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
it33 6e445ba40f Change http:// to https:// 2016-03-13 08:52:41 -07:00
Yuya Ochiai e82d6be0b5 Rename electron-mattermost to Mattermost at implementation 
npm package name (package.json: name) is "mattermost-desktop"
display name (package.json: productName) is "Mattermost"
 2016-03-13 22:55:08 +09:00
it33 b7a5b8755b Changing "menubar" to "Menu Bar" 
More common phrasing
 2016-03-12 09:48:21 -08:00
Yuya Ochiai fcbfae69a7 Disable websecurity for webview 
Only for source code.
This option should not be enabled to prevent XSS.

ref: #35, #55 and #59
 2016-03-11 21:47:39 +09:00
Yuya Ochiai 97808373ed Enable "Add" button only when "Name" and "URL" is filled out 2016-03-10 23:25:35 +09:00
Yuya Ochiai 066672205a Confirm to trust certificate when there is error 
For #26
 2016-03-06 22:00:23 +09:00
Yuya Ochiai f9387d251d Notify the error 2016-03-06 14:23:31 +09:00
Yuya Ochiai 1ccb7cebce Add test for failed to load URL 2016-03-05 20:57:16 +09:00
Yuya Ochiai 1fad30aed7 Fixup messages 2016-03-05 20:26:13 +09:00
Yuya Ochiai 3ea313743d Add error view when failed to load the URL 2016-03-04 01:51:34 +09:00
Yuya Ochiai 90f9d3ec89 Add missing args 2016-03-01 23:42:42 +09:00
Yuya Ochiai 695c091bac Refactor desktop notification override 2016-03-01 23:42:42 +09:00
Yuya Ochiai a3bf36b31b Merge branch 'feature/windows-trayicon-dot' into dev 2016-03-01 23:42:06 +09:00
Yuya Ochiai 7defd861e8 Force to use LF and add editorconfig 2016-02-26 00:07:04 +09:00
Yuya Ochiai c13afa3745 Show a dot on tray icon to notify unread messages 
Tray icon is too small to show a number.
So a dot(small circle) is used.
 2016-02-25 22:21:28 +09:00
Yuya Ochiai 81baf05c78 Fix desktop notification not working with Mattermost 2.0 
Fix #36
Notification.permission was missing in override
 2016-02-20 21:45:15 +09:00
Yuya Ochiai 75bfb119e6 Add check for null/length 2016-02-13 20:20:56 +09:00
Yuya Ochiai fea44a09c2 Switch log levels for muxed logs 2016-02-13 20:17:16 +09:00
Yuya Ochiai 87efd4e48a Mux webview console messages into main window 2016-02-13 19:30:37 +09:00
Yuya Ochiai cec2b0f5dc Fix prettify-task 2016-02-12 01:13:03 +09:00
Yuya Ochiai 528bd02414 Use numerical badge on Windows taskbar icon 2016-02-12 01:10:01 +09:00
Yuya Ochiai 0704cf544a Use webpack to build 2016-02-09 20:31:37 +09:00
Yuya Ochiai 5a836c9573 Revert mention count with ignoring 'badge-notify' 
'badge-notify' counts also unread channels.
 2016-02-03 23:53:34 +09:00
Yuya Ochiai 929e5e6f88 Fix mention count becomes twice or unexpected string 
1. 'badge-notify' exists on navbar-toggle in mobile layout.
   It has also 'badge' class, so the mention count became twice.
2. [] accessor was missing in counting.
 2016-02-02 01:11:42 +09:00
Tatsuya Niwa fc0459ee29 fix mention count bug. 2016-02-01 23:58:59 +09:00
Tatsuya Niwa 49ef1d42e6 refactoring. 2016-01-27 21:20:55 +09:00
Tatsuya Niwa f69f1f6016 * refactoring 
* bugfix: Post to active channel/DM with mention when window isn't focused, I expect count badge appear but unread badge appear.
 2016-01-26 00:35:59 +09:00
Tatsuya Niwa 95f393dc63 fix 2 bugs. see #12 and #18. 
bug1.
  Mention count does not disappear on active CHANNEL.

bug2.
  Mention count and Unread badge does not appear on active DM.
 2016-01-24 14:31:56 +09:00
Yuya Ochiai 56e8b4fe9a Show "Hide menubar" option on Linux 2016-01-23 21:33:50 +09:00
Yuya Ochiai 2e4a330b2d Merge pull request #12 from mid0111/topic-active-channel-badge 
Count for active channel only when window is not focused.

Manually merged.
 2016-01-23 21:12:15 +09:00
Tatsuya Niwa a847a0ad80 fix Badge * mark at tab. 2016-01-22 00:56:17 +09:00
Tatsuya Niwa dc10546596 fix Badge * mark 2016-01-21 22:05:34 +09:00
mid0111 ec9c8ad2cd Fixed bug due to refactoring. 2016-01-19 13:15:24 +09:00
mid0111 9438358817 Changed to count unread count of active channel from the desktop notification event. 2016-01-19 12:43:32 +09:00
mid0111 306d383994 Merge branch 'master' of https://github.com/yuya-oc/electron-mattermost into topic-active-channel-badge 2016-01-19 12:36:33 +09:00
Tatsuya Niwa d4cc42299c delete debug code. 2016-01-19 11:20:06 +09:00
Tatsuya Niwa 611c205d23 Show mention count badge and unread * badge. 2016-01-19 10:53:17 +09:00
mid0111 930bce9a14 Remove unnecessary class name. 2016-01-15 06:50:31 +09:00
Yuya Ochiai ea33fc5c58 Avoid hide-menubar functions when saving config except on Windows 2016-01-15 00:20:17 +09:00
Yuya Ochiai 54f7eb3657 Fix some error cases when the number of teams is zero 
* There is no config.json
* config.teams.length === 0
 2016-01-14 23:27:37 +09:00
Yuya Ochiai 267d0e3ded Show menubar in default setttings on Windows, and add the option to hide 2016-01-14 22:50:12 +09:00
mid0111 c5f9ca19ce Count for active channel only when window is not focused. 2016-01-14 22:31:03 +09:00
Yuya Ochiai d6afda37f2 Remove 'focus' event listener when leaving from index.html 2016-01-14 21:51:06 +09:00
Yuya Ochiai 1cc68197d2 Hide tabs when the number of teams is 1 2016-01-13 22:34:51 +09:00
Yuya Ochiai f2209aa9dd Keep focus on webview after switching to main window 
When switching window focus, webview lost its focus. Please refer to #10
 2016-01-12 21:37:34 +09:00
Yuya Ochiai e53a43d17a Use primitive and promise-style test cases 
On OS X, tests for multiple elements often failed (#5). So I replaced them with primitive way.
 2016-01-10 00:54:32 +09:00
Yuya Ochiai 3e300c78d6 Show badges when active channels have new messages 2016-01-06 22:15:35 +09:00
Yuya Ochiai 777aab9b11 Fix jp_fonts for mattermost 2015-12-27 17:06:14 +09:00
Yuya Ochiai 3d8d39562f Add simple tests for settings.html 2015-12-27 16:12:20 +09:00
Yuya Ochiai f3d668f4a0 Remove old codes 2015-12-24 00:29:42 +09:00
Yuya Ochiai 7fb2dc9cb6 Add tests for tabs 2015-12-23 20:53:54 +09:00
Yuya Ochiai 62b6e4c51b Fix for failed tests 2015-12-23 19:25:14 +09:00
Yuya Ochiai d010d09ef4 Add context menu for cut, copy, paste, select all 2015-12-23 17:55:39 +09:00
Yuya Ochiai f57e2a94ef Just focus mainWindow when notification is clicked on Windows 
BrowserWindow.show() breaks Aero Snap state.
 2015-12-23 17:42:59 +09:00
Yuya Ochiai 69a1c177a1 Switch to the team when notification is clicked 2015-12-23 17:16:53 +09:00
Yuya Ochiai 762c4dbbac Show unread badge on application icon 2015-12-23 17:06:17 +09:00
Yuya Ochiai 390c67a7fd Show unread count badge for each tabs 2015-12-23 16:21:33 +09:00
Yuya Ochiai c016c03741 Port core features from index.js (Open link, Unread count, Font) 2015-12-23 15:53:34 +09:00
Yuya Ochiai 7f8ba9fd56 Use config file to show multiple teams 2015-12-23 01:37:28 +09:00
Yuya Ochiai e381a89cd5 Adapt to rearranged directories 2015-12-22 23:35:22 +09:00
Yuya Ochiai 1be5077ebe Rearrange directories 2015-12-22 23:29:33 +09:00