Commit graph

1481 commits

Author SHA1 Message Date
Yuya Ochiai bd22b9b9dc
Merge pull request #682 from yuya-oc/purge-caches
Fix cache-purging not working
2018-01-18 22:49:23 +09:00
Yuya Ochiai aec97da07a Locate NOTICE.txt and LICENSE.txt under Content/Resources on Mac 2018-01-18 22:45:12 +09:00
Jason Blais 8dda44f023
Tweak setting help text for Dock icon bounce setting 2018-01-18 08:17:47 -05:00
Jason Blais 7e7a215ed4
Update v4.0 changelog 2018-01-18 08:00:00 -05:00
Yuya Ochiai 4caf906ad6 Fix cache-purging not working 2018-01-18 00:32:19 +09:00
Yuya Ochiai 78ffa6466f Fix deep linking not working when the app is not already opened 2018-01-16 22:12:43 +09:00
Jason Blais 250794b93c
Fix typo 2017-12-15 09:30:54 -05:00
Jason Blais b31d301e87
Update CHANGELOG.md 2017-12-14 12:46:38 -05:00
Jason Blais 52559111fa
Merge pull request #674 from yuya-oc/replace-loading-animation
Replace loading animation
2017-12-14 12:41:29 -05:00
Yuya Ochiai a96664c7b1 Replace loading animation 2017-12-15 00:04:26 +09:00
Yuya Ochiai 72ee03161f
Merge pull request #673 from yuya-oc/show-permissions-dialog-for-untrusted
Show permissions dialog only for untrusted origins
2017-12-06 22:48:05 +09:00
Yuya Ochiai 5eafe2e7fb Show permissions dialog only for untrusted origins 2017-12-05 00:59:54 +09:00
Yuya Ochiai 7dc75a1b86
Merge pull request #669 from uber-uchat/WhiteLabelSettingAndErrorPages
White label setting and error pages
2017-11-28 23:18:51 +09:00
Jason Blais db5d4ebbed
Merge pull request #665 from mattermost/jasonblais-patch-1
Remove dev dependancies from NOTICE.txt
2017-11-28 08:28:41 -05:00
David Meza 4bf7069ea8 White label ErrorView.jsx 2017-11-27 14:24:56 -05:00
David Meza 8f91ea5b77 White label new setting message on SettingsPage.jsx 2017-11-27 12:40:16 -05:00
Yuya Ochiai 59209ae604
Merge pull request #664 from yuya-oc/fix-loading-icon
Support React 16 of webapp for loading icon
2017-11-28 00:32:48 +09:00
Yuya Ochiai a28176a6d7 Add the case where the user is not logged in webapp 2017-11-27 23:47:41 +09:00
Jason Blais c80938afc4
Remove dev dependancies from NOTICE.txt
These are dev dependancies in https://github.com/mattermost/desktop/blob/master/package.json and not bundled with the release build like regular dependancies.

@yuya-oc please confirm if any of these should be considered dependancies instead of dev dependancies 

https://stackoverflow.com/questions/18875674/whats-the-difference-between-dependencies-devdependencies-and-peerdependencies

PS: Not urgent to review, any time in the next week or two before the v4.0 release.
2017-11-23 18:03:31 -05:00
Yuya Ochiai aabf18c6a0 Support React 16 of webapp for loading icon
data-reactroot is no longer used in React 16
https://stackoverflow.com/questions/47203183/missing-data-reactroot-attirbute-in-react-16
2017-11-24 00:55:41 +09:00
Yuya Ochiai aa003c7207
Merge pull request #655 from yuya-oc/fix-permission-dialog-lag
Fix permission dialog lag
2017-11-24 00:02:43 +09:00
Yuya Ochiai 4efd585d60
Merge pull request #656 from mattermost/jasonblais-patch-1
Replace hard-coded doc link with a redirect
2017-11-18 16:28:00 +09:00
Jason Blais 514a4fb156
Update TESTING.md 2017-11-17 11:31:35 -05:00
Jason Blais 2aea3150f8
Update README.md 2017-11-17 10:14:10 -05:00
Jason Blais 48701bf730
Update buildConfig.js 2017-11-17 10:13:55 -05:00
Jason Blais 43eb391c77
Update README.md 2017-11-17 10:13:45 -05:00
Jason Blais 099171d1f6
Update TESTING.md 2017-11-17 10:13:19 -05:00
Yuya Ochiai f78dac4542 Remove findDOMNode 2017-11-17 00:31:40 +09:00
Yuya Ochiai ff7c783a3a Fix lag for PermissionRequestDialog 2017-11-17 00:28:22 +09:00
Yuya Ochiai 7a8b920cd3
Merge pull request #651 from wvds/GH-514
Implement Mac bounce feature
2017-11-16 00:40:53 +09:00
Yuya Ochiai 3bd267c660
Update CHANGELOG.md 2017-11-16 00:40:12 +09:00
Jason Blais c315323545
Update SettingsPage.jsx 2017-11-15 10:07:56 -05:00
Wesley van der Sanden f970fda2e3 Select 'Once' option by default
Also fixes a small typo in an unrelated part of the code.

GH-514
2017-11-14 22:19:43 +01:00
Wesley van der Sanden 5cf940b314 Change default setting from 0 to false
GH-514
2017-11-13 23:22:44 +01:00
Wesley van der Sanden 53ba79294b Implement Mac bounce feature
Closes #514
2017-11-09 15:01:47 +01:00
Yuya Ochiai 5ccbeb080c
Merge pull request #647 from yuya-oc/ignore-gpu-process-crashed
Ignore "gpu-process-crashed" event then output the log to console
2017-11-09 01:41:15 +09:00
Yuya Ochiai 3a865f3d24
Merge pull request #633 from yuya-oc/simplify-two-config
Simplify and split config.json into defaultPreferences and buildConfig
2017-11-09 00:49:09 +09:00
Yuya Ochiai fdf0d51442 Update error message for buildConfig 2017-11-09 00:37:35 +09:00
Yuya Ochiai 45963a9eb1 Revert "Show error dialog when wrong buildConfig is used"
This reverts commit fa578fb37c.
2017-11-09 00:35:05 +09:00
Yuya Ochiai 992828fea7
Merge pull request #645 from yuya-oc/permission-request-handler-2
Add PermissionRequestDialog for when the app doesn't show the TabBar
2017-11-08 23:29:07 +09:00
Yuya Ochiai 09f24131fa Ignore "gpu-process-crashed" event then output the log to console 2017-11-08 23:23:25 +09:00
Yuya Ochiai 08b1058694 Add PermissionRequestDialog for when the app doesn't show the TabBar 2017-11-08 01:37:39 +09:00
Yuya Ochiai f7a9f50764 Check buildConfig before packaging the application 2017-11-08 01:09:42 +09:00
Yuya Ochiai 4137df4098 Ignore JSON.parse expections on PermissionManager constructor
https://github.com/mattermost/desktop/pull/633#issuecomment-342508014
2017-11-08 00:44:36 +09:00
Yuya Ochiai 30da348e6e Remove unnecessary white space from the dialog message 2017-11-08 00:39:23 +09:00
Yuya Ochiai fa578fb37c Show error dialog when wrong buildConfig is used 2017-11-07 22:32:23 +09:00
Yuya Ochiai 878b5c1a42 Restrict adding a server even when the number of servers is zero 2017-11-07 22:20:33 +09:00
Yuya Ochiai 4abd72856f Move enableServerManagement key from defaultPreferences to buildConfig 2017-11-07 22:06:47 +09:00
Yuya Ochiai 51e6d5f039 Remove deepmerge 2017-11-07 21:44:00 +09:00
Yuya Ochiai baf0022892 Add test for splitted config files 2017-11-07 21:42:05 +09:00