Skip to content

Commit

Permalink
Merge branch 'release/0.6.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Mar 21, 2020
2 parents 1a11c38 + 90821d1 commit 18c9f6e
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 49 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: main
name: netlify

on:
push:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [0.6.11] - 2020-03-21
### Changed
- Update dependencies

## [0.6.10] - 2020-03-14
### Changed
- Update dependencies
Expand Down Expand Up @@ -271,7 +275,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
### Added
- First release

[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.10...HEAD
[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.11...HEAD
[0.6.11]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.10...v0.6.11
[0.6.10]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.9...v0.6.10
[0.6.9]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.8...v0.6.9
[0.6.8]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.7...v0.6.8
Expand Down
78 changes: 39 additions & 39 deletions package-lock.json

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

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "piping-ui",
"version": "0.6.10",
"version": "0.6.11",
"private": true,
"author": "Ryo Ota <[email protected]> (https://github.com/nwtgck)",
"scripts": {
Expand Down Expand Up @@ -32,7 +32,7 @@
"jwk-thumbprint": "^0.1.3",
"linkifyjs": "^2.1.8",
"openpgp": "^4.10.1",
"register-service-worker": "^1.7.0",
"register-service-worker": "^1.7.1",
"sanitize-html": "^1.22.1",
"smoothscroll-polyfill": "^0.4.4",
"ts-json-validator": "git+https://github.com/nwtgck/ts-json-validator.git#v0.1.2",
Expand All @@ -42,8 +42,8 @@
"vue-async-computed-decorator": "0.0.4",
"vue-class-component": "^7.2.3",
"vue-filepond": "^6.0.2",
"vue-property-decorator": "^8.4.0",
"vuetify": "^2.2.17"
"vue-property-decorator": "^8.4.1",
"vuetify": "^2.2.18"
},
"devDependencies": {
"@mdi/js": "^5.0.45",
Expand All @@ -53,14 +53,14 @@
"@types/jszip": "^3.1.7",
"@types/mocha": "^7.0.2",
"@types/openpgp": "^4.4.8",
"@types/react": "^16.9.23",
"@types/react": "^16.9.25",
"@types/react-dom": "^16.9.5",
"@types/sanitize-html": "^1.22.0",
"@types/smoothscroll-polyfill": "^0.3.1",
"@types/url-join": "^4.0.0",
"@types/workbox-sw": "^4.3.0",
"@typescript-eslint/eslint-plugin": "^2.23.0",
"@typescript-eslint/parser": "^2.23.0",
"@typescript-eslint/eslint-plugin": "^2.24.0",
"@typescript-eslint/parser": "^2.24.0",
"@vue/cli-plugin-babel": "~4.2.3",
"@vue/cli-plugin-eslint": "~4.2.3",
"@vue/cli-plugin-pwa": "~4.2.3",
Expand All @@ -77,7 +77,7 @@
"eslint-plugin-vue": "^6.2.2",
"license-checker": "^25.0.1",
"material-design-icons-iconfont": "^5.0.1",
"react": "^16.13.0",
"react": "^16.13.1",
"sass": "^1.26.3",
"sass-loader": "^8.0.2",
"typescript": "~3.8.3",
Expand Down

2 comments on commit 18c9f6e

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.