Merge from upstream #5
Merged
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
ログイン時のカートマージでカートが別れる場合のDoctrineのエラーを回避
…kurozumi-patch-13
…kurozumi-patch-13
This reverts commit e26c7b3.
…kurozumi-patch-13
forタグにif条件の追加はTwig2.10で非推奨なので修正
Doctrine ORM3.0ではサポートされないので、flushにエンティティを指定している処理を修正。
Hogeプラグインのcomposer.jsonを修正
Bump version from jQuery 3.3.1 to 3.5.1
Travis CI の実行内容は GitHub Actions に置き換え済みなので削除する
管理画面ログイン履歴機能の微調整をしました
CSVインポートの時に文字列に含まれる改行コードを残すようにする
Badge を GitHub Actions に変更
codeception.sh を Travis CI 連携廃止に伴い削除
IP制限（拒否リスト）とログイン履歴とE2Eテストを追加
管理画面ログイン履歴とIPアドレスによるアクセス拒否を実装
nginx.conf.sample に bin ディレクトリを追加
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <[email protected]>
docker-compose ファイルを分割する
管理画面のお知らせのE2Eテストをリダイレクトに対応
Bump y18n from 3.2.1 to 3.2.2
4.0ブランチの修正を4.1-featureブランチに取り込み
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.
No description provided.