Skip to content
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

Merging release back to master #120

Merged
merged 24 commits into from
Jul 28, 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
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.64](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.64) (2020-07-27)

**Note:** Version bump only for package material-ui-x





## [0.1.63](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.63) (2020-07-27)

**Note:** Version bump only for package material-ui-x





## [0.1.62](https://github.com/mui-org/material-ui-x/compare/v0.1.61...v0.1.62) (2020-07-22)

**Note:** Version bump only for package material-ui-x
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
},
"packages": ["!packages/grid", "packages/*", "packages/grid/*"],
"version": "0.1.62",
"version": "0.1.64",
"npmClient": "yarn",
"useWorkspaces": true
}
16 changes: 16 additions & 0 deletions packages/demo-app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.64](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.64) (2020-07-27)

**Note:** Version bump only for package demo-app





## [0.1.63](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.63) (2020-07-27)

**Note:** Version bump only for package demo-app





## [0.1.62](https://github.com/mui-org/material-ui-x/compare/v0.1.61...v0.1.62) (2020-07-22)

**Note:** Version bump only for package demo-app
Expand Down
4 changes: 2 additions & 2 deletions packages/demo-app/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "demo-app",
"version": "0.1.62",
"version": "0.1.64",
"private": true,
"dependencies": {
"@material-ui/core": "^4.9.12",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
"@material-ui/x-grid": "^0.1.62",
"@material-ui/x-grid": "^0.1.64",
"@material-ui/x-grid-data-generator": "^0.1.62",
"@trendmicro/react-interpolate": "^0.5.5",
"react": "^16.13.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/grid/data-grid/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.64](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.64) (2020-07-27)

**Note:** Version bump only for package @material-ui/data-grid





## [0.1.63](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.63) (2020-07-27)

**Note:** Version bump only for package @material-ui/data-grid





## [0.1.62](https://github.com/mui-org/material-ui-x/compare/v0.1.61...v0.1.62) (2020-07-22)

**Note:** Version bump only for package @material-ui/data-grid
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/data-grid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@material-ui/data-grid",
"version": "0.1.62",
"version": "0.1.64",
"description": "The Material-UI community edition of the data grid component.",
"author": "Material-UI Team",
"main": "dist/index-cjs.js",
Expand All @@ -17,7 +17,7 @@
"tslib": "^2.0.0"
},
"devDependencies": {
"@material-ui/x-grid-modules": "^0.1.62",
"@material-ui/x-grid-modules": "^0.1.64",
"@rollup/plugin-node-resolve": "^8.0.1",
"rollup": "^2.6.1",
"rollup-plugin-cleaner": "^1.0.0",
Expand Down
16 changes: 16 additions & 0 deletions packages/grid/x-grid-modules/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.64](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.64) (2020-07-27)

**Note:** Version bump only for package @material-ui/x-grid-modules





## [0.1.63](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.63) (2020-07-27)

**Note:** Version bump only for package @material-ui/x-grid-modules





## [0.1.62](https://github.com/mui-org/material-ui-x/compare/v0.1.61...v0.1.62) (2020-07-22)

**Note:** Version bump only for package @material-ui/x-grid-modules
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-grid-modules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@material-ui/x-grid-modules",
"version": "0.1.62",
"version": "0.1.64",
"description": "Material-UI shared grid modules",
"author": "Material-UI Team",
"main": "dist/index-cjs.js",
Expand Down
16 changes: 16 additions & 0 deletions packages/grid/x-grid/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.64](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.64) (2020-07-27)

**Note:** Version bump only for package @material-ui/x-grid





## [0.1.63](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.63) (2020-07-27)

**Note:** Version bump only for package @material-ui/x-grid





## [0.1.62](https://github.com/mui-org/material-ui-x/compare/v0.1.61...v0.1.62) (2020-07-22)

**Note:** Version bump only for package @material-ui/x-grid
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/x-grid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@material-ui/x-grid",
"version": "0.1.62",
"version": "0.1.64",
"description": "The Material-UI X edition of the data grid component.",
"author": "Material-UI Team",
"main": "dist/index-cjs.js",
Expand All @@ -17,7 +17,7 @@
"tslib": "^2.0.0"
},
"devDependencies": {
"@material-ui/x-grid-modules": "^0.1.62",
"@material-ui/x-grid-modules": "^0.1.64",
"@material-ui/x-license": "^0.1.61",
"@rollup/plugin-node-resolve": "^8.0.1",
"@rollup/plugin-replace": "^2.3.3",
Expand Down
16 changes: 16 additions & 0 deletions packages/storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.64](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.64) (2020-07-27)

**Note:** Version bump only for package @material-ui/x-storybook





## [0.1.63](https://github.com/dtassone/material-ui-x/compare/v0.1.62...v0.1.63) (2020-07-27)

**Note:** Version bump only for package @material-ui/x-storybook





## [0.1.62](https://github.com/mui-org/material-ui-x/compare/v0.1.61...v0.1.62) (2020-07-22)

**Note:** Version bump only for package @material-ui/x-storybook
Expand Down
6 changes: 3 additions & 3 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@material-ui/x-storybook",
"version": "0.1.62",
"version": "0.1.64",
"description": "Storybook components",
"author": "Material-UI Team",
"private": true,
"dependencies": {
"@material-ui/core": "^4.9.12",
"@material-ui/data-grid": "^0.1.62",
"@material-ui/data-grid": "^0.1.64",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.54",
"@material-ui/x-grid": "^0.1.62",
"@material-ui/x-grid": "^0.1.64",
"@material-ui/x-grid-data-generator": "^0.1.62",
"@material-ui/x-license": "^0.1.61",
"faker": "^4.1.0",
Expand Down