imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature-multi-language-spell-check

Browse source
This commit is contained in:
Šimon Brandner 2020-12-03 12:04:46 +01:00
commit 24cc106d90
9 changed files with 67 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/vector/index.ts
View file

@ -23,6 +23,7 @@ limitations under the License.
// in webpack.config.js
require('gfm.css/gfm.css');
require('highlight.js/styles/github.css');
require('katex/dist/katex.css')
// These are things that can run before the skin loads - be careful not to reference the react-sdk though.
import {parseQsFromFragment} from "./url_utils";

4
src/vector/platform/ElectronPlatform.tsx
View file

@ -515,9 +515,9 @@ export default class ElectronPlatform extends VectorBasePlatform {
return url;
}
startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string, idpId?: string) {
// this will get intercepted by electron-main will-navigate
super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin);
super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin, idpId);
Modal.createTrackedDialog('Electron', 'SSO', InfoDialog, {
title: _t("Go to your browser to complete Sign In"),
description: <Spinner />,