forked from coreui/coreui-free-bootstrap-admin-template
-
Notifications
You must be signed in to change notification settings - Fork 10
Update coreui master and merge into requested aspnetcore merge #1
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
Open
lukevp
wants to merge
95
commits into
mvelosop:aspnetcore
Choose a base branch
from
lukevp:aspnetcore
base: aspnetcore
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added div around the cart-body, so the collapse is working smoothly now over the complete height of the card instead of the height without padding
Feat pug support
Renamed .divider to .dropdown-divider. see https://getbootstrap.com/docs/4.0/migration/#dropdowns
fix: add missing js-beautify dependency
feat(basic-forms): add missing date-input
- update: `@coreui/coreui` to `2.0.10` - update: `babel-eslint` to `10.0.0`
chore: dependencies update
- update: `@coreui/coreui` to `2.0.11` fixes some IE11 and `rtl` issues - chore: update `babel-eslint` to `10.0.1` - chore: update `stylelint` to `9.6.0`
fix(collapse.pug): add mb-0 to accordion cards
- 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`
- update: `@coreui/coreui` to `^2.1.7` - update: `bootstrap` to `^4.3.1` - update: `core-js` to `^2.6.5` - update: `popper.js` to `^1.14.7` - update: `@babel/core` to `^7.3.3` - update: `@babel/plugin-proposal-object-rest-spread` to `^7.3.2` - update: `@babel/preset-env` to `^7.3.1` - update: `autoprefixer` to `^9.4.8` - update: `eslint` to `^5.14.1` - update: `eslint-plugin-compat` to `^2.7.0` - update: `nodemon` to `^1.18.10` - update: `postcss-cli` to `^6.1.2` - update: `stylelint` to `^9.10.1` - update: `stylelint-scss` to `^3.5.3`
- chore: drop @babel/polyfill in favour of core-js@3 and regenerator-runtime - update: `@coreui/coreui` to `^2.1.12` - update: `@coreui/coreui-plugin-chartjs-custom-tooltips` to `^1.3.1` - update: `chart.js` to `^2.8.0` - update: `core-js` to `^3.1.3` - update: `flag-icon-css` to `^3.3.0` - update: `jquery` to `^3.4.1` - update: `popper.js` to `^1.15.0` - add: `regenerator-runtime` to `^0.13.2` - update: `@babel/cli` to `^7.4.4` - update: `@babel/core` to `^7.4.5` - update: `@babel/plugin-proposal-object-rest-spread` to `^7.4.4` - add: `@babel/plugin-proposal-throw-expressions` to `^7.2.0` - update: `@babel/preset-env` to `^7.4.5` - update: `autoprefixer` to `^9.6.0` - update: `browser-sync` to `^2.26.7` - update: `clean-css-cli` to `^4.3.0` - update: `js-beautify` to `^1.10.0` - update: `nodemon` to `^1.19.1` - update: `node-sass` to `^4.12.0` - update: `eslint` to `^5.16.0` - update: `eslint-plugin-compat` to `^3.1.1` - update: `stylelint` to `^10.1.0` - update: `stylelint-config-recommended-scss` to `^3.3.0` - update: `stylelint-config-standard` to `^18.3.0` - update: `stylelint-order` to `^3.0.0` - update: `stylelint-scss` to `^3.8.0`
- update: `core-js` to `^3.1.3` - update: `babel-eslint` to `^10.0.2` - update: `eslint-plugin-compat` to `^3.1.2`
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.14) Signed-off-by: dependabot[bot] <[email protected]>
- update: `core-js` to `^3.1.4` - update: `babel-eslint` to `^10.0.2` - update: `@babel/cli` to `^7.5.0` - update: `@babel/core` to `^7.5.4` - update: `@babel/plugin-proposal-object-rest-spread` to `^7.5.4` - update: `@babel/preset-env` to `^7.5.4` - update: `autoprefixer` to `^9.6.1` - update: `copyfiles` to `^2.1.1` - update: `eslint-plugin-compat` to `^3.2.0` - update: `postcss-cli` to `^6.1.3` - update: `pug` to `^2.0.4` - update: `stylelint-order` to `^3.0.1` - update: `stylelint-scss` to `^3.9.1`
fix(cards): outdated switch class, add card-header-actions
Merge latest coreui into master
# Conflicts: # package-lock.json # package.json
When file extension was specified, the directory recursion broke in the getFolderTreeFiles. This didn't matter in the old CoreUI because all of the html template files were in a single directory. Now they are broken apart into subdirs. Filtering should occur on the file fork rather than prefiltering by extension, since directories will always fail this check.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I pulled the latest version of CoreUI into this fork, then merged it into the aspnetcore branch and verified that the .cshtml generation and asp.net core build tool still runs properly. If you approve this PR it should also update your open PR with the original coreui library.