Code

4.1ブランチの修正を4.2ブランチへマージ#5487

Code

Merged

taguchimasahiro merged 37 commits intoEC-CUBE:4.2EC-CUBE/ec-cube:4.2from chihiro-adachi:merge-41chihiro-adachi/ec-cube:merge-41Copy head branch name to clipboardAug 2, 2022

+97-91

Commits

Commits on Jun 3, 2022

• Bump semver-regex from 3.1.3 to 3.1.4

  Show description for e5a09a2
  dependabot[bot]

  authored
  e5a09a2

  Copy full SHA for e5a09a2

Commits on Jun 8, 2022

• SKIP_INSTALL_SCRIPT_ON_DOCKER_BUILDを廃止して初回実行時に初期化するように修正

  kiy0taka

  committed
  4047d13

  Copy full SHA for 4047d13

• www-dataで実行

  kiy0taka

  committed
  a5651ac

  Copy full SHA for a5651ac

• ec-cubeコンテナが起動するまで待機

  kiy0taka

  committed
  8f2f869

  Copy full SHA for 8f2f869

• SQLiteで利用できないので--if-not-existsオプションは使用しない

  kiy0taka

  committed
  0ad0fbc

  Copy full SHA for 0ad0fbc

• ec-cubeコンテナが起動するまで待つ

  kiy0taka

  committed
  7372f65

  Copy full SHA for 7372f65

• SKIP_INSTALL_SCRIPT_ON_DOCKER_BUILDを削除

  kiy0taka

  committed
  fc93eea

  Copy full SHA for fc93eea

Commits on Jun 9, 2022

• upgrade mailcatcher-codeception-module

  kiy0taka

  committed
  402b7cd

  Copy full SHA for 402b7cd

• $message['recipients'] -> $message->getRecipients()

  kiy0taka

  committed
  77942f0

  Copy full SHA for 77942f0

Commits on Jun 14, 2022

• update gulp-sass

  Show description for c394377
  

  Ruk

  authored
  c394377

  Copy full SHA for c394377

Commits on Jun 15, 2022

• Merge pull request EC-CUBE#5384 from kiy0taka/dev/upgrade-mailcatcher-codeception-module

  Show description for 6c466ad
  chihiro-adachi

  authored
  6c466ad

  Copy full SHA for 6c466ad

• Bump guzzlehttp/guzzle from 6.5.6 to 6.5.7

  Show description for 89cf6e9
  dependabot[bot]

  authored
  89cf6e9

  Copy full SHA for 89cf6e9

• Merge remote-tracking branch 'upstream/4.1' into dev/initialize_on_first_startup

  kiy0taka

  committed
  c081e92

  Copy full SHA for c081e92

Commits on Jun 17, 2022

• Bump jpeg-js from 0.4.3 to 0.4.4 in /zap/selenium/ci/TypeScript

  Show description for 1919352
  dependabot[bot]

  authored
  1919352

  Copy full SHA for 1919352

Commits on Jun 20, 2022

• Merge pull request #1 from EC-CUBE/4.1

  Show description for 0655787
  

  Ruk

  authored
  0655787

  Copy full SHA for 0655787

• update

  

  Ruk

  authored
  a1e6668

  Copy full SHA for a1e6668

Commits on Jun 21, 2022

• Merge pull request EC-CUBE#5381 from EC-CUBE/dependabot/npm_and_yarn/semver-regex-3.1.4

  Show description for 9092094
  chihiro-adachi

  authored
  9092094

  Copy full SHA for 9092094

• Merge pull request EC-CUBE#5394 from EC-CUBE/dependabot/npm_and_yarn/zap/selenium/ci/TypeScript/jpeg-js-0.4.4

  Show description for 33b3184
  chihiro-adachi

  authored
  33b3184

  Copy full SHA for 33b3184

• Merge pull request EC-CUBE#5386 from EC-CUBE/dependabot/composer/guzzlehttp/guzzle-6.5.7

  Show description for 9d1d337
  chihiro-adachi

  authored
  9d1d337

  Copy full SHA for 9d1d337

• Bump guzzlehttp/guzzle from 6.5.7 to 6.5.8

  Show description for 5f836bf
  dependabot[bot]

  authored
  5f836bf

  Copy full SHA for 5f836bf

Commits on Jun 22, 2022

• Merge pull request EC-CUBE#5403 from EC-CUBE/dependabot/composer/guzzlehttp/guzzle-6.5.8

  Show description for bfeb2c9
  chihiro-adachi

  authored
  bfeb2c9

  Copy full SHA for bfeb2c9

Commits on Jun 24, 2022

• Merge branch 'EC-CUBE:4.1' into patch-1

  

  Ruk

  authored
  b8b3966

  Copy full SHA for b8b3966

Commits on Jul 12, 2022

• Merge pull request EC-CUBE#5369 from kiy0taka/dev/initialize_on_first_startup

  Show description for 81c50dd
  chihiro-adachi

  authored
  81c50dd

  Copy full SHA for 81c50dd

Commits on Jul 13, 2022

• 商品CSV登録で商品コードの項目がなければ更新を無視するように対応

  k-yamamura

  committed
  0db130e

  Copy full SHA for 0db130e

• Update messages.en.yaml

  talalio

  authored
  b7fafd5

  Copy full SHA for b7fafd5

Commits on Jul 21, 2022

• Merge pull request EC-CUBE#5389 from 5ym/patch-1

  Show description for 781b44d
  chihiro-adachi

  authored
  781b44d

  Copy full SHA for 781b44d

• Merge pull request EC-CUBE#5441 from maborosh1/maborosh1-patch-1

  Show description for 3070826
  chihiro-adachi

  authored
  3070826

  Copy full SHA for 3070826

• Merge pull request EC-CUBE#5438 from k-yamamura/feature-productcsvimport

  Show description for 091b3b1
  chihiro-adachi

  authored
  091b3b1

  Copy full SHA for 091b3b1

Commits on Jul 22, 2022

• 受注登録時に電話番号のバリデーションを効くように修正

  kiy0taka

  committed
  36cbdeb

  Copy full SHA for 36cbdeb

• 使用されていないhiddenを削除

  kiy0taka

  committed
  74d7919

  Copy full SHA for 74d7919

• Merge pull request EC-CUBE#5464 from kiy0taka/fix/order-phone-number-validation

  Show description for 25e7b1c
  carkn

  authored
  25e7b1c

  Copy full SHA for 25e7b1c

• $this->form->isValid()は常にfalseになるので、テスト対象のフォームごとに確認するように変更

  kiy0taka

  committed
  064e59c

  Copy full SHA for 064e59c

• 郵便番号のバリデーションが効くように修正

  kiy0taka

  committed
  fbee989

  Copy full SHA for fbee989

Commits on Jul 25, 2022

• Merge pull request EC-CUBE#5466 from kiy0taka/fix/remove-unuse-hidden

  Show description for 92b9393
  carkn

  authored
  92b9393

  Copy full SHA for 92b9393

Commits on Aug 2, 2022

• Merge pull request EC-CUBE#5469 from kiy0taka/fix/improved-order-type-test

  Show description for e09643d
  chihiro-adachi

  authored
  e09643d

  Copy full SHA for e09643d

• Merge pull request EC-CUBE#5470 from kiy0taka/fix/order-type-constraints

  Show description for d5b681c
  chihiro-adachi

  authored
  d5b681c

  Copy full SHA for d5b681c

• Merge remote-tracking branch 'origin/4.1' into merge-41

  chihiro-adachi

  committed
  d66ba86

  Copy full SHA for d66ba86