Skip to content

Commit

Permalink
Merge branch 'master' into telemetry/fix-search-in-advanced-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Apr 28, 2020
2 parents 34de8b7 + e7971fa commit 422854b
Show file tree
Hide file tree
Showing 21 changed files with 1,008 additions and 455 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ kibana_vars=(
xpack.security.session.idleTimeout
xpack.security.session.lifespan
xpack.security.loginAssistanceMessage
xpack.security.loginHelp
telemetry.allowChangingOptInStatus
telemetry.enabled
telemetry.optIn
Expand Down
13 changes: 11 additions & 2 deletions x-pack/plugins/security/common/login_state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,24 @@

import { LoginLayout } from './licensing';

export interface LoginSelectorProvider {
type: string;
name: string;
usesLoginForm: boolean;
description?: string;
hint?: string;
icon?: string;
}

export interface LoginSelector {
enabled: boolean;
providers: Array<{ type: string; name: string; description?: string }>;
providers: LoginSelectorProvider[];
}

export interface LoginState {
layout: LoginLayout;
allowLogin: boolean;
showLoginForm: boolean;
requiresSecureConnection: boolean;
loginHelp?: string;
selector: LoginSelector;
}
5 changes: 0 additions & 5 deletions x-pack/plugins/security/public/authentication/_index.scss

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/

import './_authentication_state_page.scss';

import { EuiIcon, EuiSpacer, EuiTitle } from '@elastic/eui';
import React from 'react';

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Loading

0 comments on commit 422854b

Please sign in to comment.