This repository has been archived by the owner on Jan 2, 2022. It is now read-only.
Feature/add editpage #133
Merged
Feature/add editpage #133
Conversation
This file contains 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
commit 064eb0a Author: hosono kotaro <hosono1985@gmail.com> Date: Sun Feb 21 11:00:29 2021 +0900 fix: precommit script (#127) commit bea617a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Feb 21 10:21:22 2021 +0900 build(deps-dev): bump @babel/preset-typescript from 7.12.16 to 7.12.17 (#124) Bumps [@babel/preset-typescript](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-typescript) from 7.12.16 to 7.12.17. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.12.17/packages/babel-preset-typescript) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hosono kotaro <hosono1985@gmail.com> commit 1d2c51b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Feb 20 23:19:41 2021 +0900 build(deps-dev): bump @types/webpack-bundle-analyzer from 3.9.0 to 3.9.1 (#123) commit 64f4864 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Feb 20 23:14:33 2021 +0900 build(deps-dev): bump @typescript-eslint/parser from 4.14.2 to 4.15.1 (#122) commit 806314f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Feb 20 23:06:46 2021 +0900 build(deps-dev): bump @types/node from 14.14.22 to 14.14.31 (#121) commit 3781d1d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Feb 20 23:00:33 2021 +0900 build(deps-dev): bump @typescript-eslint/eslint-plugin (#120) commit 7ecf748 Author: hosono kotaro <hosono1985@gmail.com> Date: Sat Feb 20 20:51:55 2021 +0900 feature/husky fix (#125) * feat: Add husky * fix: precommit task
…kotaro-blog into feature/add-editpage
commit 5609b26 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 19:41:57 2021 +0900 build(deps-dev): bump html-webpack-plugin from 4.5.1 to 5.2.0 (#130) Bumps [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) from 4.5.1 to 5.2.0. - [Release notes](https://github.com/jantimon/html-webpack-plugin/releases) - [Changelog](https://github.com/jantimon/html-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](jantimon/html-webpack-plugin@v4.5.1...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit e45d792 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:29:30 2021 +0900 build(deps-dev): bump @babel/preset-env from 7.12.16 to 7.13.8 (#134) commit bb6093c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:26:48 2021 +0900 build(deps-dev): bump @typescript-eslint/parser from 4.15.1 to 4.15.2 (#132) commit d899582 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:21:37 2021 +0900 build(deps-dev): bump @babel/preset-react from 7.12.10 to 7.12.13 (#129)
commit c655686 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:52:47 2021 +0900 build(deps-dev): bump is-ci from 2.0.0 to 3.0.0 (#140) commit 8fddef2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:48:32 2021 +0900 build(deps-dev): bump css-loader from 5.0.1 to 5.1.1 (#139) commit ad98aaf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:41:59 2021 +0900 build(deps-dev): bump fork-ts-checker-webpack-plugin from 6.1.0 to 6.1.1 (#138) commit 9a9f16e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:35:52 2021 +0900 build(deps-dev): bump eslint-config-prettier from 7.2.0 to 8.1.0 (#137) commit 5609b26 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 19:41:57 2021 +0900 build(deps-dev): bump html-webpack-plugin from 4.5.1 to 5.2.0 (#130) Bumps [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) from 4.5.1 to 5.2.0. - [Release notes](https://github.com/jantimon/html-webpack-plugin/releases) - [Changelog](https://github.com/jantimon/html-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](jantimon/html-webpack-plugin@v4.5.1...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit e45d792 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:29:30 2021 +0900 build(deps-dev): bump @babel/preset-env from 7.12.16 to 7.13.8 (#134) commit bb6093c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:26:48 2021 +0900 build(deps-dev): bump @typescript-eslint/parser from 4.15.1 to 4.15.2 (#132) commit d899582 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:21:37 2021 +0900 build(deps-dev): bump @babel/preset-react from 7.12.10 to 7.12.13 (#129)
commit 8d3a7f0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Mar 14 01:40:16 2021 +0900 build(deps-dev): bump webpack-cli from 4.4.0 to 4.5.0 (#146) Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.4.0...webpack-cli@4.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hosono kotaro <hosono1985@gmail.com> commit 56bc5fa Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Mar 14 01:32:37 2021 +0900 build(deps-dev): bump ts-jest from 26.5.1 to 26.5.3 (#145) Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 26.5.1 to 26.5.3. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md) - [Commits](kulshekhar/ts-jest@v26.5.1...v26.5.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 7967d40 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Mar 14 01:27:53 2021 +0900 build(deps-dev): bump stylelint from 13.9.0 to 13.12.0 (#144) Bumps [stylelint](https://github.com/stylelint/stylelint) from 13.9.0 to 13.12.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md) - [Commits](stylelint/stylelint@13.9.0...13.12.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hosono kotaro <hosono1985@gmail.com> commit 101e07e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Mar 14 01:10:01 2021 +0900 build(deps-dev): bump typescript from 4.1.3 to 4.2.3 (#143) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.1.3 to 4.2.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v4.1.3...v4.2.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hosono kotaro <hosono1985@gmail.com> commit 267ddce Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun Mar 14 01:03:22 2021 +0900 build(deps-dev): bump cypress from 6.3.0 to 6.6.0 (#142) Bumps [cypress](https://github.com/cypress-io/cypress) from 6.3.0 to 6.6.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](cypress-io/cypress@v6.3.0...v6.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit c655686 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:52:47 2021 +0900 build(deps-dev): bump is-ci from 2.0.0 to 3.0.0 (#140) commit 8fddef2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:48:32 2021 +0900 build(deps-dev): bump css-loader from 5.0.1 to 5.1.1 (#139) commit ad98aaf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:41:59 2021 +0900 build(deps-dev): bump fork-ts-checker-webpack-plugin from 6.1.0 to 6.1.1 (#138) commit 9a9f16e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Mar 6 10:35:52 2021 +0900 build(deps-dev): bump eslint-config-prettier from 7.2.0 to 8.1.0 (#137) commit 5609b26 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 19:41:57 2021 +0900 build(deps-dev): bump html-webpack-plugin from 4.5.1 to 5.2.0 (#130) Bumps [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) from 4.5.1 to 5.2.0. - [Release notes](https://github.com/jantimon/html-webpack-plugin/releases) - [Changelog](https://github.com/jantimon/html-webpack-plugin/blob/main/CHANGELOG.md) - [Commits](jantimon/html-webpack-plugin@v4.5.1...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit e45d792 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:29:30 2021 +0900 build(deps-dev): bump @babel/preset-env from 7.12.16 to 7.13.8 (#134) commit bb6093c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:26:48 2021 +0900 build(deps-dev): bump @typescript-eslint/parser from 4.15.1 to 4.15.2 (#132) commit d899582 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Mar 1 00:21:37 2021 +0900 build(deps-dev): bump @babel/preset-react from 7.12.10 to 7.12.13 (#129)
|
package-lock file の conflict を解決する必要がある |
|
作業が長期に渡るため、一度マージする。ただし下記のタスクを早急に解決したい。 残タスク |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.