Skip to content

Commit 28a2cfa

Browse files
author
Michail Yasonik
authored
Merge branch 'master' into breadcrumbs
2 parents d05885f + 1925be3 commit 28a2cfa

File tree

1,358 files changed

+7404
-16257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,358 files changed

+7404
-16257
lines changed

‎.eslintrc.js

+7-37
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
1+
const SSPL_ELASTIC_2_0_LICENSE_HEADER = `
12
/*
2-
* Licensed to Elasticsearch B.V. under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch B.V. licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
19-
20-
const APACHE_2_0_LICENSE_HEADER = `
21-
/*
22-
* Licensed to Elasticsearch B.V. under one or more contributor
23-
* license agreements. See the NOTICE file distributed with
24-
* this work for additional information regarding copyright
25-
* ownership. Elasticsearch B.V. licenses this file to you under
26-
* the Apache License, Version 2.0 (the "License"); you may
27-
* not use this file except in compliance with the License.
28-
* You may obtain a copy of the License at
29-
*
30-
* http://www.apache.org/licenses/LICENSE-2.0
31-
*
32-
* Unless required by applicable law or agreed to in writing,
33-
* software distributed under the License is distributed on an
34-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
35-
* KIND, either express or implied. See the License for the
36-
* specific language governing permissions and limitations
37-
* under the License.
3+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
4+
* or more contributor license agreements. Licensed under the Elastic License
5+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
6+
* in compliance with, at your election, the Elastic License 2.0 or the Server
7+
* Side Public License, v 1.
388
*/
399
`;
4010

@@ -76,7 +46,7 @@ module.exports = {
7646
'local/require-license-header': [
7747
'warn',
7848
{
79-
license: APACHE_2_0_LICENSE_HEADER,
49+
license: SSPL_ELASTIC_2_0_LICENSE_HEADER,
8050
},
8151
],
8252
'no-use-before-define': 'off',

‎CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
## [`master`](https://github.com/elastic/eui/tree/master)
22

3-
- Updated `EuiContextMenuPanelDescriptor`'s `title` prop type from `string` to `ReactNode` ([#4933](https://github.com/elastic/eui/pull/4933))
3+
- Improved keyboard and screen reader experience for `EuiColorPicker` ([#4886](https://github.com/elastic/eui/pull/4886))
44
- Improved accessibility of `EuiBreadcrumbs` ([#4763](https://github.com/elastic/eui/pull/4763))
55

6+
**Bug fixes**
7+
8+
- Fixed focus bug in `EuiColorPicker` which allowed user to break out of focus lock ([#4886](https://github.com/elastic/eui/pull/4886))
9+
10+
## [`35.0.0`](https://github.com/elastic/eui/tree/v35.0.0)
11+
12+
**Breaking changes**
13+
14+
- Changed EUI license from Apache v2 to dual-licensed Elastic v2 and Server Side Public License, v 1 ([#4930](https://github.com/elastic/eui/pull/4930))
15+
16+
## [`34.6.0`](https://github.com/elastic/eui/tree/v34.6.0)
17+
18+
- Updated `EuiContextMenuPanelDescriptor`'s `title` prop type from `string` to `ReactNode` ([#4933](https://github.com/elastic/eui/pull/4933))
19+
620
## [`34.5.2`](https://github.com/elastic/eui/tree/v34.5.2)
721

822
**Bug fixes**

‎FAQ.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The Elastic UI Framework (EUI) is a design library in use at Elastic to build Re
88

99
## Can I use EUI?
1010

11-
Yes, but be aware of the [license](LICENSE) as always. Although the roadmap and priorities are directed by our own usage within Elastic, we do attempt to make the platform generically useful for any React application and try to test for it.
11+
See our licensing FAQ: [I’m using EUI or Elastic Charts in my application outside of Kibana, how does this affect me?](https://www.elastic.co/pricing/faq/licensing#im-using-eui-or-elastic-charts-in-my-application-outside-of-kibana-how-does-this-affect-me)
1212

1313
## What is the versioning, releases and upgrade strategy?
1414

‎LICENSE

-192
This file was deleted.

‎LICENSE.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Source code in this repository is covered by (i) a dual license under the Server
2+
Side Public License, v 1 and the Elastic License 2.0 or (ii) an Apache License
3+
2.0 compatible license or (iii) solely under the Elastic License 2.0, in each
4+
case, as noted in the applicable header. The default throughout the repository
5+
is a dual license under the Server Side Public License, v 1 and the Elastic
6+
License 2.0, unless the header specifies another license.

‎NOTICE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
EUI
2-
Copyright 2012-2018 Elasticsearch B.V.
2+
Copyright 2012-2021 Elasticsearch B.V.
33

44
---
55
This product bundles code based on react-datepicker@2.0.0 which is

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ directly in the code. And unit test coverage for the UI components allows us to
8484

8585
## License
8686

87-
[Apache Licensed.][license] Read the [FAQ][faq] for details.
87+
[Dual-licensed under Elastic v2 and Server Side Public License, v 1][license] Read the [FAQ][faq] for details.
8888

89-
[license]: LICENSE
89+
[license]: LICENSE.txt
9090
[faq]: FAQ.md
9191
[consuming]: wiki/consuming.md
9292
[docs]: https://elastic.github.io/eui/

0 commit comments

Comments
 (0)