Skip to content

Commit

Permalink
[PLT-959] Browser Compatibility (mattermost#6945)
Browse files Browse the repository at this point in the history
* Error page implimentation

* Update Browser Compatibility check to check Chrome, FF, IE, Edge, and Safai

* Update strings with proper edge version

* undo uneeded changes and move to go template.

* more unneeded additions

* eliminate js and add local triangle

* fix typo

* Correct debug logging of browser version

* Modify Browser Check to pass user_agent object only and write test.

* Fix chrome version typo and correct testing change that broke chrome UA chack

* simplity browser version detection by using maps instead of string splitting
  • Loading branch information
moonmeister authored and crspeller committed Sep 6, 2017
1 parent 7f52f61 commit 7060a5b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
5 changes: 4 additions & 1 deletion i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1455,11 +1455,14 @@
"emoji_picker.recent": "Recently Used",
"emoji_picker.search": "Search",
"emoji_picker.symbols": "Symbols",
"error.generic.title": "Error",
"error.generic.message": "An error has occurred.",
"error.generic.link_message": "Back to Mattermost",
"error.generic.link": "Back to Mattermost",
"error.generic.message": "An error has occurred.",
"error.local_storage.help1": "Enable cookies",
"error.local_storage.help2": "Turn off private browsing",
"error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
"error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 52+, Safari 9, Edge 40+)",
"error.local_storage.message": "Mattermost was unable to load because a setting in your browser prevents the use of its local storage features. To allow Mattermost to load, try the following actions:",
"error.not_found.link_message": "Back to Mattermost",
"error.not_found.message": "The page you were trying to reach does not exist",
Expand Down
Binary file added images/warning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@ if (TEST) {
{from: 'images/logo-email.png', to: 'images'},
{from: 'images/circles.png', to: 'images'},
{from: 'images/favicon', to: 'images/favicon'},
{from: 'images/appIcons.png', to: 'images'}
{from: 'images/appIcons.png', to: 'images'},
{from: 'images/warning.png', to: 'images'}
])
);
}
Expand Down

0 comments on commit 7060a5b

Please sign in to comment.