Skip to content

Commit

Permalink
Merge pull request #431 from coreui/dev-vnext
Browse files Browse the repository at this point in the history
v2.1.5
  • Loading branch information
xidedix authored Oct 1, 2018
2 parents ef16ab0 + 2391b68 commit 881619b
Show file tree
Hide file tree
Showing 44 changed files with 224 additions and 192 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v2.1.5
- update: `@coreui/coreui` to [`2.0.12`](https://github.com/coreui/coreui/releases) fixes some IE11 and `rtl` issues
- update: `@babel/cli` to `7.1.2`
- update: `@babel/core` to `7.1.2`
- update: `eslint to `5.6.1`
- update: `foreach-cli` to `1.8.1`

## v2.1.4
- feat(basic-forms): add missing `date-input`
- update: `@coreui/coreui` to `2.0.11` fixes some IE11 and `rtl` issues
Expand Down
231 changes: 151 additions & 80 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-bootstrap-admin-template",
"version": "2.1.4",
"version": "2.1.5",
"description": "Free Bootstrap Admin Template",
"keywords": [
"admin",
Expand Down Expand Up @@ -63,7 +63,7 @@
"watch-pug": "nodemon -e pug -x \"npm run pug\""
},
"dependencies": {
"@coreui/coreui": "^2.0.11",
"@coreui/coreui": "^2.0.12",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
"@coreui/icons": "0.3.0",
"bootstrap": "4.1.3",
Expand All @@ -77,8 +77,8 @@
"simple-line-icons": "2.4.1"
},
"devDependencies": {
"@babel/cli": "^7.1.0",
"@babel/core": "^7.1.0",
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"autoprefixer": "^9.1.5",
Expand All @@ -89,9 +89,9 @@
"clean-css-cli": "^4.2.1",
"copyfiles": "^2.1.0",
"cross-env": "^5.2.0",
"eslint": "^5.6.0",
"eslint": "^5.6.1",
"eslint-plugin-compat": "^2.5.1",
"foreach-cli": "^1.8.0",
"foreach-cli": "^1.8.1",
"js-beautify": "^1.8.6",
"node-sass": "^4.9.3",
"nodemon": "^1.18.4",
Expand Down
2 changes: 1 addition & 1 deletion src/404.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.4
* @version v2.1.5
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 1 addition & 1 deletion src/500.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
* CoreUI - Free Bootstrap Admin Template
* @version v2.1.4
* @version v2.1.5
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
Loading

0 comments on commit 881619b

Please sign in to comment.