Skip to content

Commit

Permalink
Merge pull request #458 from coreui/dev-vnext
Browse files Browse the repository at this point in the history
v2.1.11
  • Loading branch information
xidedix authored Jan 7, 2019
2 parents 90e6992 + 4d682eb commit c31b402
Show file tree
Hide file tree
Showing 64 changed files with 2,106 additions and 890 deletions.
22 changes: 21 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## v2.1.next
## v2.1.11
- fix(collapse): add `mb-0` to accordion cards, thanks @ubugnu #449
- update: `@coreui/coreui` to `^2.1.5`
- update: `bootstrap` to `^4.2.1`
- update: `core-js` to `^2.6.1`
- update: `perfect-scrollbar` to `^1.4.0`
- update: `popper.js` to `^1.14.6`
- update: `@babel/cli` to `^7.2.3`
- update: `@babel/core` to `^7.2.2`
- update: `@babel/plugin-proposal-object-rest-spread` to `^7.2.0`
- update: `@babel/preset-env` to `^7.2.3`
- update: `autoprefixer` to `^9.4.4`
- update: `chalk` to `^2.4.2`
- update: `eslint` to `^5.12.0`
- update: `js-beautify` to `^1.8.9`
- update: `node-sass` to `^4.11.0`
- update: `nodemon` to `^1.18.9`
- update: `postcss-cli` to `^6.1.1`
- update: `rimraf` to `^2.6.3`
- update: `stylelint` to `^9.9.0`
- update: `stylelint-scss` to `^3.4.4`


## v2.1.10
- fix: update `nodemon` to `1.18.7` (remove vulnerability)
Expand Down
1,168 changes: 742 additions & 426 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 20 additions & 20 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.10",
"version": "2.1.11",
"description": "Free Bootstrap Admin Template",
"keywords": [
"admin",
Expand Down Expand Up @@ -63,49 +63,49 @@
"watch-pug": "nodemon -e pug -x \"npm run pug\""
},
"dependencies": {
"@coreui/coreui": "^2.1.3",
"@coreui/coreui": "^2.1.5",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "1.2.0",
"@coreui/icons": "0.3.0",
"bootstrap": "4.1.3",
"bootstrap": "^4.2.1",
"chart.js": "2.7.3",
"core-js": "^2.5.7",
"core-js": "^2.6.1",
"flag-icon-css": "^3.2.1",
"font-awesome": "4.7.0",
"jquery": "3.3.1",
"pace-progress": "1.0.2",
"perfect-scrollbar": "1.4.0",
"popper.js": "^1.14.5",
"perfect-scrollbar": "^1.4.0",
"popper.js": "^1.14.6",
"simple-line-icons": "2.4.1"
},
"devDependencies": {
"@babel/cli": "^7.1.5",
"@babel/core": "^7.1.6",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.1.6",
"autoprefixer": "^9.3.1",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.2.3",
"autoprefixer": "^9.4.4",
"babel-eslint": "^10.0.1",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
"browser-sync": "^2.26.3",
"chalk": "^2.4.1",
"chalk": "^2.4.2",
"clean-css-cli": "^4.2.1",
"copyfiles": "^2.1.0",
"cross-env": "^5.2.0",
"eslint": "^5.9.0",
"eslint": "^5.12.0",
"eslint-plugin-compat": "^2.6.3",
"foreach-cli": "^1.8.1",
"js-beautify": "^1.8.8",
"node-sass": "^4.10.0",
"nodemon": "^1.18.7",
"js-beautify": "^1.8.9",
"node-sass": "^4.11.0",
"nodemon": "^1.18.9",
"npm-run-all": "^4.1.5",
"postcss-cli": "^6.0.1",
"postcss-cli": "^6.1.1",
"pug": "^2.0.3",
"rimraf": "^2.6.2",
"rimraf": "^2.6.3",
"shelljs": "^0.8.3",
"stylelint": "^9.8.0",
"stylelint": "^9.9.0",
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-order": "^2.0.0",
"stylelint-scss": "^3.4.0"
"stylelint-scss": "^3.4.4"
},
"engines": {
"node": ">=6"
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.10
* @version v2.1.11
* @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.10
* @version v2.1.11
* @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/base/breadcrumb.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.10
* @version v2.1.11
* @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/base/cards.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.10
* @version v2.1.11
* @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/base/carousel.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.10
* @version v2.1.11
* @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/base/collapse.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.10
* @version v2.1.11
* @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/base/forms.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.10
* @version v2.1.11
* @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/base/jumbotron.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.10
* @version v2.1.11
* @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/base/list-group.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.10
* @version v2.1.11
* @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/base/navs.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.10
* @version v2.1.11
* @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/base/pagination.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.10
* @version v2.1.11
* @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/base/popovers.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.10
* @version v2.1.11
* @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/base/progress.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.10
* @version v2.1.11
* @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/base/scrollspy.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.10
* @version v2.1.11
* @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/base/switches.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.10
* @version v2.1.11
* @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/base/tables.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.10
* @version v2.1.11
* @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/base/tabs.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.10
* @version v2.1.11
* @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/base/tooltips.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.10
* @version v2.1.11
* @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/blank.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.10
* @version v2.1.11
* @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/buttons/brand-buttons.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.10
* @version v2.1.11
* @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/buttons/button-group.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.10
* @version v2.1.11
* @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/buttons/buttons.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.10
* @version v2.1.11
* @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/buttons/dropdowns.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.10
* @version v2.1.11
* @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/charts.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.10
* @version v2.1.11
* @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/colors.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.10
* @version v2.1.11
* @link https://coreui.io
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
Loading

0 comments on commit c31b402

Please sign in to comment.