Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/elastic/kibana into 164995-…
Browse files Browse the repository at this point in the history
…add-log-explorer-app-locator
  • Loading branch information
mohamedhamed-ahmed committed Sep 20, 2023
2 parents a3a7994 + 27056ca commit 93a25e2
Show file tree
Hide file tree
Showing 36 changed files with 701 additions and 717 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"yarn": "^1.22.19"
},
"resolutions": {
"**/@hello-pangea/dnd": "16.2.0",
"**/@types/node": "18.17.1",
"**/@typescript-eslint/utils": "5.62.0",
"**/chokidar": "^3.5.3",
Expand All @@ -100,7 +101,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.9.1-canary.1",
"@elastic/ems-client": "8.4.0",
"@elastic/eui": "88.2.0",
"@elastic/eui": "88.3.0",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand All @@ -125,7 +126,7 @@
"@hapi/hoek": "^9.2.1",
"@hapi/inert": "^6.0.4",
"@hapi/wreck": "^17.1.0",
"@hello-pangea/dnd": "^16.3.0",
"@hello-pangea/dnd": "16.2.0",
"@juggle/resize-observer": "^3.4.0",
"@kbn/aad-fixtures-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/aad",
"@kbn/ace": "link:packages/kbn-ace",
Expand Down

Large diffs are not rendered by default.

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

Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ interface EuiValues {

export const getEuiContextMapping = (): EuiTokensObject => {
return {
'euiAccordion.isLoading': i18n.translate('core.euiAccordion.isLoading', {
defaultMessage: 'Loading',
}),
'euiAccordionChildrenLoading.message': i18n.translate(
'core.euiAccordionChildrenLoading.message',
{
defaultMessage: 'Loading',
}
),
'euiAutoRefresh.autoRefreshLabel': i18n.translate('core.euiAutoRefresh.autoRefreshLabel', {
defaultMessage: 'Auto refresh',
}),
Expand Down Expand Up @@ -419,6 +422,18 @@ export const getEuiContextMapping = (): EuiTokensObject => {
'There is a new region landmark called {landmarkHeading} with page level controls at the end of the document.',
values: { landmarkHeading },
}),
'euiGlobalToastList.clearAllToastsButtonAriaLabel': i18n.translate(
'core.euiGlobalToastList.clearAllToastsButtonAriaLabel',
{
defaultMessage: 'Clear all toast notifications',
}
),
'euiGlobalToastList.clearAllToastsButtonDisplayText': i18n.translate(
'core.euiGlobalToastList.clearAllToastsButtonDisplayText',
{
defaultMessage: 'Clear all',
}
),
'euiKeyboardShortcuts.title': i18n.translate('core.euiKeyboardShortcuts.title', {
defaultMessage: 'Keyboard shortcuts',
}),
Expand Down
Loading

0 comments on commit 93a25e2

Please sign in to comment.