Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage #49781

Merged
merged 12 commits into from
Jan 8, 2020
Merged

[Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage #49781

merged 12 commits into from
Jan 8, 2020

Commits on Oct 30, 2019

  1. [Metrics UI] Pass relevant shouldAllowEdit capabilities into Settings… 

    …Page
    @Zacqary
    Zacqary committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    95be4e8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into 48180-settings-ca… 

    …pabilities-fix

# Conflicts:
#	x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
    @Zacqary
    Zacqary committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    229471b View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. Split settings pages in two; add loading screen to settings page

    @Zacqary
    Zacqary committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0dde711 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Merge branch 'master' into 48180-settings-capabilities-fix

    @elasticmachine
    elasticmachine committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    c94b1db View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Merge remote-tracking branch 'upstream/master' into 48180-settings-ca… 

    …pabilities-fix
    @Zacqary
    Zacqary committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f4c348a View commit details
    Browse the repository at this point in the history

  2. Merge branch '48180-settings-capabilities-fix' of github.com:Zacqary/… 

    …kibana into 48180-settings-capabilities-fix
    @Zacqary
    Zacqary committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5818a1e View commit details
    Browse the repository at this point in the history

  3. Restore timestamp field to metrics screen

    @Zacqary
    Zacqary committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f098e45 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. Merge branch 'master' into 48180-settings-capabilities-fix

    @elasticmachine
    elasticmachine committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    7aceccc View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. Merge branch 'master' into 48180-settings-capabilities-fix

    @elasticmachine
    elasticmachine committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    791ff8e View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge branch 'master' into 48180-settings-capabilities-fix

    @elasticmachine
    elasticmachine committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    8522e94 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Merge remote-tracking branch 'upstream/master' into 48180-settings-ca… 

    …pabilities-fix

# Conflicts:
#	x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
#	x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
#	x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
#	x-pack/legacy/plugins/infra/public/pages/logs/settings.tsx
    @Zacqary
    Zacqary committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    a6f1221 View commit details
    Browse the repository at this point in the history

  2. Merge branch '48180-settings-capabilities-fix' of github.com:Zacqary/… 

    …kibana into 48180-settings-capabilities-fix
    @Zacqary
    Zacqary committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    5ac3c14 View commit details
    Browse the repository at this point in the history