Code

4.0ブランチの修正を4.1-featureブランチに取り込み#4999

Code

Merged

kiy0taka merged 44 commits intoEC-CUBE:4.1-featureEC-CUBE/ec-cube:4.1-featurefrom okazy:improve/4.0okazy/ec-cube:improve/4.0Copy head branch name to clipboardApr 5, 2021

+231-613

Commits

Commits on Jan 12, 2021

• Bump version from jQuery 3.3.1 to 3.5.1

  nanasess

  committed
  43457d5

  Copy full SHA for 43457d5

Commits on Feb 17, 2021

• forタグにif条件の追加はTwig2.10で非推奨なので修正

  kurozumi

  committed
  8710ebd

  Copy full SHA for 8710ebd

• Doctrine ORM3.0ではサポートされないので、flushにエンティティを指定している処理を修正。

  kurozumi

  committed
  9687191

  Copy full SHA for 9687191

• Twig2.9以降filterタグは非推奨なのでapplyタグに変更

  kurozumi

  committed
  e26c7b3

  Copy full SHA for e26c7b3

Commits on Feb 26, 2021

• CSVインポートの時に文字列に含まれる改行コードを残すようにする

  yshirai-joolen

  committed
  eda333d

  Copy full SHA for eda333d

• CSVインポートテストが空行の存在を想定してないので修正

  yshirai-joolen

  committed
  5277414

  Copy full SHA for 5277414

Commits on Mar 9, 2021

• docker-compose.*.yml を分割

  nanasess

  committed
  b5ceda5

  Copy full SHA for b5ceda5

• APP_ENVは Docker コンテナ経由で渡せるように修正

  nanasess

  committed
  33bbca8

  Copy full SHA for 33bbca8

• Fix memory_limit to 786M

  nanasess

  committed
  fc0df6a

  Copy full SHA for fc0df6a

• 未使用の環境変数を削除

  nanasess

  committed
  f2601a3

  Copy full SHA for f2601a3

Commits on Mar 16, 2021

• ログイン時のカートマージでカートが別れる場合のDoctrineのエラーを回避

  okazy

  committed
  a7cfaf1

  Copy full SHA for a7cfaf1

• Merge branch '4.0' of https://github.com/EC-CUBE/ec-cube into 4.0

  kurozumi

  committed
  c3a02f8

  Copy full SHA for c3a02f8

• Merge pull request #6 from okazy/kurozumi-patch-13

  Show description for 5c5d965
  kurozumi

  authored
  5c5d965

  Copy full SHA for 5c5d965

• Merge branch '4.0' of github.com:kurozumi/ec-cube into 4.0

  kurozumi

  committed
  0b394f9

  Copy full SHA for 0b394f9

• ログイン時のカートマージでカートが別れる場合のDoctrineのエラーを回避

  

  okazy

  authored and

  kurozumi

  committed
  a6ba83a

  Copy full SHA for a6ba83a

• Merge branch 'kurozumi-patch-13' of github.com:kurozumi/ec-cube into kurozumi-patch-13

  kurozumi

  committed
  e402e73

  Copy full SHA for e402e73

• ログイン時のカートマージでカートが別れる場合のDoctrineのエラーを回避

  

  okazy

  authored and

  kurozumi

  committed
  84881bc

  Copy full SHA for 84881bc

• Merge branch 'kurozumi-patch-13' of github.com:kurozumi/ec-cube into kurozumi-patch-13

  kurozumi

  committed
  8efdd10

  Copy full SHA for 8efdd10

• Revert "Twig2.9以降filterタグは非推奨なのでapplyタグに変更"

  Show description for 0ba5d6e
  kurozumi

  committed
  0ba5d6e

  Copy full SHA for 0ba5d6e

• Merge branch 'kurozumi-patch-13' of github.com:kurozumi/ec-cube into kurozumi-patch-13

  kurozumi

  committed
  94acdbc

  Copy full SHA for 94acdbc

• Merge pull request EC-CUBE#4924 from kurozumi/kurozumi-patch-12

  Show description for 6866c8a
  matsuoshi

  authored
  6866c8a

  Copy full SHA for 6866c8a

• Merge pull request EC-CUBE#4925 from kurozumi/kurozumi-patch-13

  Show description for b0bc5ef
  matsuoshi

  authored
  b0bc5ef

  Copy full SHA for b0bc5ef

• Hogeプラグインのcomposer.jsonを修正

  izayoi256

  committed
  427f21a

  Copy full SHA for 427f21a

• Merge branch '4.0' of https://github.com/EC-CUBE/ec-cube into 4.0

  kurozumi

  committed
  9a471e4

  Copy full SHA for 9a471e4

Commits on Mar 17, 2021

• 非推奨の文字列を修正

  kurozumi

  committed
  47e0362

  Copy full SHA for 47e0362

Commits on Mar 18, 2021

• Merge pull request EC-CUBE#4971 from kurozumi/deprecated-message-fix

  Show description for 98b5104
  okazy

  authored
  98b5104

  Copy full SHA for 98b5104

• Merge pull request EC-CUBE#4968 from izayoi256/bugfix/hoge

  Show description for 8e027bf
  okazy

  authored
  8e027bf

  Copy full SHA for 8e027bf

• Merge pull request EC-CUBE#4833 from nanasess/update-jquery

  Show description for ce95030
  okazy

  authored
  ce95030

  Copy full SHA for ce95030

Commits on Mar 22, 2021

• Remove .travis.yml

  nanasess

  committed
  fb06bb3

  Copy full SHA for fb06bb3

• Remove obsolete ymls

  nanasess

  committed
  592d081

  Copy full SHA for 592d081

• docker-php-entrypoint で APP_ENV を設定するよう修正

  nanasess

  committed
  bc553e8

  Copy full SHA for bc553e8

Commits on Mar 23, 2021

• Merge pull request EC-CUBE#4979 from nanasess/delete-travis

  Show description for f5dd1c8
  okazy

  authored
  f5dd1c8

  Copy full SHA for f5dd1c8

• Merge pull request EC-CUBE#4942 from yshirai-joolen/remove_drop_new_line

  Show description for 3e492f7
  chihiro-adachi

  authored
  3e492f7

  Copy full SHA for 3e492f7

• Badge を GitHub Actions に変更

  nanasess

  committed
  ac53139

  Copy full SHA for ac53139

Commits on Mar 24, 2021

• Travis CI 連携廃止に伴い削除

  nanasess

  committed
  fa1dfb7

  Copy full SHA for fa1dfb7

Commits on Mar 25, 2021

• Merge pull request EC-CUBE#4983 from nanasess/change-badge

  Show description for 6c95d36
  okazy

  authored
  6c95d36

  Copy full SHA for 6c95d36

• Merge pull request EC-CUBE#4984 from nanasess/remove-codeception.sh

  Show description for 035120b
  okazy

  authored
  035120b

  Copy full SHA for 035120b

Commits on Mar 26, 2021

• 管理画面のお知らせのE2Eテストをリダイレクトに対応

  okazy

  committed
  2cf0b53

  Copy full SHA for 2cf0b53

• nginx.conf.sample に bin ディレクトリを追加

  nanasess

  committed
  3f40c76

  Copy full SHA for 3f40c76

Commits on Mar 30, 2021

• Merge pull request EC-CUBE#4992 from nanasess/add-bin-nginx

  Show description for 471d5d3
  okazy

  authored
  471d5d3

  Copy full SHA for 471d5d3

• Bump y18n from 3.2.1 to 3.2.2

  Show description for b5d1bb1
  dependabot[bot]

  authored
  b5d1bb1

  Copy full SHA for b5d1bb1

• Merge pull request EC-CUBE#4955 from nanasess/split-docker-compose

  Show description for d2bcb0d
  chihiro-adachi

  authored
  d2bcb0d

  Copy full SHA for d2bcb0d

Commits on Mar 31, 2021

• Merge pull request EC-CUBE#4989 from okazy/fix/e2e-top-information

  Show description for 7c59b53
  chihiro-adachi

  authored
  7c59b53

  Copy full SHA for 7c59b53

Commits on Apr 1, 2021

• Merge pull request EC-CUBE#4993 from EC-CUBE/dependabot/npm_and_yarn/y18n-3.2.2

  Show description for 23da54c
  okazy

  authored
  23da54c

  Copy full SHA for 23da54c