Skip to content

[pull] master from coreui:master #26

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.

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

Merged
merged 5 commits into from
May 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog

##### `v2.6.1`
- fix(Dashboard): `scales.[x/y]Axes.barPercentage` is deprecated, use `dataset.barPercentage` instead
- fix(Dropdowns): DropdownMenu right
- refactor(polyfill): cleanup

###### dependencies update
- update: `@coreui/coreui` to `^2.1.16`
- update: `@coreui/react` to `^2.5.7`
- update: `bootstrap` to `^4.5.0`
- update: `chart.js` to `^2.9.3`
- update: `core-js` to `^3.6.5`
- update: `enzyme` to `^3.11.0`
- update: `enzyme-adapter-react-16` to `^1.15.2`
- update: `flag-icon-css` to `^3.4.6`
- update: `node-sass` to `^4.14.1`
- update: `react` to `^16.13.1`
- update: `react-app-polyfill` to `^1.0.6`
- update: `react-chartjs-2` to `^2.9.0`
- update: `react-dom` to `^16.13.1`
- update: `react-router-config` to `^5.1.1`
- update: `react-router-dom` to `^5.2.0`
- update: `react-test-renderer` to `^16.13.1`
- update: `reactstrap` to `^8.4.1`
- update: `react-scripts` to `^3.4.1`

##### `v2.6.0`
- move to `reactstrap v8`. Breaking changes and deprecations, see: https://github.com/reactstrap/reactstrap/blob/master/CHANGELOG.md#800-2019-04-03
- fix(DefaultHeader): replace `AppHeaderDropdown` with `UncontrolledDropdown`
Expand Down
11,505 changes: 5,579 additions & 5,926 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-react-admin-template",
"version": "2.6.0",
"version": "2.6.1",
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
"author": "Łukasz Holeczek",
"homepage": "https://coreui.io",
Expand All @@ -12,32 +12,32 @@
"url": "[email protected]:coreui/coreui-free-react-admin-template.git"
},
"dependencies": {
"@coreui/coreui": "^2.1.12",
"@coreui/coreui": "^2.1.16",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
"@coreui/icons": "0.3.0",
"@coreui/react": "^2.5.1",
"bootstrap": "^4.3.1",
"chart.js": "^2.8.0",
"@coreui/react": "^2.5.8",
"bootstrap": "^4.5.0",
"chart.js": "^2.9.3",
"classnames": "^2.2.6",
"core-js": "^3.1.4",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"flag-icon-css": "^3.3.0",
"core-js": "^3.6.5",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"flag-icon-css": "^3.4.6",
"font-awesome": "^4.7.0",
"node-sass": "^4.12.0",
"node-sass": "^4.14.1",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-app-polyfill": "^1.0.1",
"react-chartjs-2": "^2.7.6",
"react-dom": "^16.8.6",
"react-router-config": "^5.0.1",
"react-router-dom": "^5.0.1",
"react-test-renderer": "^16.8.6",
"reactstrap": "^8.0.0",
"react": "^16.13.1",
"react-app-polyfill": "^1.0.6",
"react-chartjs-2": "^2.9.0",
"react-dom": "^16.13.1",
"react-router-config": "^5.1.1",
"react-router-dom": "^5.2.0",
"react-test-renderer": "^16.13.1",
"reactstrap": "^8.4.1",
"simple-line-icons": "^2.4.1"
},
"devDependencies": {
"react-scripts": "^3.0.1"
"react-scripts": "^3.4.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion src/containers/DefaultLayout/DefaultFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DefaultFooter extends Component {

return (
<React.Fragment>
<span><a href="https://coreui.io">CoreUI</a> &copy; 2019 creativeLabs.</span>
<span><a href="https://coreui.io">CoreUI</a> &copy; 2020 creativeLabs.</span>
<span className="ml-auto">Powered by <a href="https://coreui.io/react">CoreUI for React</a></span>
</React.Fragment>
);
Expand Down
34 changes: 17 additions & 17 deletions src/polyfill.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ import "core-js";
import 'core-js/features/set/map';

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
// import 'core-js/es6/symbol'
// import 'core-js/es6/object'
// import 'core-js/es6/function'
// import 'core-js/es6/parse-int'
// import 'core-js/es6/parse-float'
// import 'core-js/es6/number'
// import 'core-js/es6/math'
// import 'core-js/es6/string'
// import 'core-js/es6/date'
// import 'core-js/es6/array'
// import 'core-js/es6/regexp'
// import 'core-js/es6/map'
// import 'core-js/es6/weak-map'
// import 'core-js/es6/set'
// import 'core-js/es7/object'
// import 'core-js/es/symbol'
// import 'core-js/es/object'
// import 'core-js/es/function'
// import 'core-js/es/parse-int'
// import 'core-js/es/parse-float'
// import 'core-js/es/number'
// import 'core-js/es/math'
// import 'core-js/es/string'
// import 'core-js/es/date'
// import 'core-js/es/array'
// import 'core-js/es/regexp'
// import 'core-js/es/map'
// import 'core-js/es/weak-map'
// import 'core-js/es/set'
// import 'core-js/es/object'

/** IE10 and IE11 requires the following for the Reflect API. */
// import 'core-js/es6/reflect'
// import 'core-js/es/reflect'

/** Evergreen browsers require these. **/
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
// import 'core-js/es7/reflect'
// import 'core-js/es/reflect'

// CustomEvent() constructor functionality in IE9, IE10, IE11
(function () {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Base/Dropdowns/Dropdowns.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Dropdowns extends Component {
<DropdownToggle caret>
This dropdown's menu is right-aligned
</DropdownToggle>
<DropdownMenu right style={{right: 'auto'}}>
<DropdownMenu right>
<DropdownItem header>Header</DropdownItem>
<DropdownItem disabled>Action</DropdownItem>
<DropdownItem>Another Action</DropdownItem>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Dashboard/Dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ const cardChartData4 = {
backgroundColor: 'rgba(255,255,255,.3)',
borderColor: 'transparent',
data: [78, 81, 80, 45, 34, 12, 40, 75, 34, 89, 32, 68, 54, 72, 18, 98],
barPercentage: 0.6,
},
],
};
Expand All @@ -217,7 +218,6 @@ const cardChartOpts4 = {
xAxes: [
{
display: false,
barPercentage: 0.6,
}],
yAxes: [
{
Expand Down