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

src/vector/index.ts

@@ -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";

src/vector/platform/ElectronPlatform.tsx

@@ -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 />,