Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Experimental/sf #8

Open
wants to merge 4,796 commits into
base: master
Choose a base branch
from
Open

Experimental/sf #8

wants to merge 4,796 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 24, 2018

  1. Merge remote-tracking branch 'upstream/experimental/sf' into feat-adm… 

    …in-multi-shipping

# Conflicts:
#	src/Eccube/Controller/Admin/Order/OrderController.php
    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    2061933 View commit details
    Browse the repository at this point in the history

  2. コンフリクトの解消

    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    c2a141c View commit details
    Browse the repository at this point in the history

  3. 受注編集画面の納品書出力ボタンを設定

    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    cc96f3b View commit details
    Browse the repository at this point in the history

  4. ログイン画面の修正

    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    ceb98e9 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/experimental/sf' into feature-… 

    …admin-htmlid
    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    92385a9 View commit details
    Browse the repository at this point in the history

  6. TODO 出荷に出荷日を入れる条件の見直しが必要

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    cd0eef9 View commit details
    Browse the repository at this point in the history

  7. fix 受注編集画面 複数配送の場合はお届け先フォームが出力されないため郵便番号のライブラリでエラーが発生したのを修正

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    48203a4 View commit details
    Browse the repository at this point in the history

  8. fix 受注一覧画面 複数配送管理へのリンクを修正、未出荷の場合も複数出荷管理へのリンクが出力されるように修正

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    f0418c5 View commit details
    Browse the repository at this point in the history

  9. お届け先追加のテスト追加

    @nanasess
    nanasess committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    ec118e7 View commit details
    Browse the repository at this point in the history

  10. feat 出荷管理自体がなくなったので不要なファイルを削除

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    142d71e View commit details
    Browse the repository at this point in the history

  11. Merge pull request EC-CUBE#18 from nanasess/okazy-feat-admin-multi-sh… 

    …ipping

お届け先追加のテスト追加
    @okazy
    okazy authored Jul 24, 2018
    Configuration menu
    Copy the full SHA
    0298ad6 View commit details
    Browse the repository at this point in the history

  12. 受注一覧のPDF出力ボタンを設定

    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    b6f25a6 View commit details
    Browse the repository at this point in the history

  13. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    08f59e7 View commit details
    Browse the repository at this point in the history

  14. feat 複数出荷管理画面 出荷完了・出荷完了メール送信時に文言を追加

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    7d22ae8 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/feat-admin-multi-shipping' into … 

    …feat-admin-multi-shipping
    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    0a530f5 View commit details
    Browse the repository at this point in the history

  16. feat 複数出荷管理画面 ページタイトルの修正

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    71d0cae View commit details
    Browse the repository at this point in the history

  17. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    07af741 View commit details
    Browse the repository at this point in the history

  18. Merge pull request EC-CUBE#3394 from k-yamamura/experimental/sf-w29-o… 

    …rder-pdf

帳票出力機能の作成
    Chihiro Adachi authored Jul 24, 2018
    Configuration menu
    Copy the full SHA
    49de0c2 View commit details
    Browse the repository at this point in the history

  19. feat 複数出荷管理画面 ページタイトルの修正・不要なテストファイルを削除

    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    b74b28d View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'upstream/experimental/sf' into feat-adm… 

    …in-multi-shipping

# Conflicts:
#	src/Eccube/Resource/template/admin/Order/index.twig
    @okazy
    okazy committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    497efcb View commit details
    Browse the repository at this point in the history

  21. EC-CUBE#261 【ご注文手続き】お届け日のプルダウンに曜日も出したい

    @kengo-kamon
    kengo-kamon committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    af40c1c View commit details
    Browse the repository at this point in the history

  22. EC-CUBE#286 【ご注文履歴詳細】受注管理から登録した値引きが表示されていない

    @kengo-kamon
    kengo-kamon committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    d647d6d View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. Merge pull request EC-CUBE#3373 from okazy/feat-admin-multi-shipping 

    複数出荷画面の実装
    Chihiro Adachi authored Jul 25, 2018
    Configuration menu
    Copy the full SHA
    4304926 View commit details
    Browse the repository at this point in the history

  2. Merge pull request EC-CUBE#3305 from tao-s/patch-4 

    MySQLだとDoctrineのDateTimeTzが使えなくて+9h表示されちゃうので
    Chihiro Adachi authored Jul 25, 2018
    Configuration menu
    Copy the full SHA
    2931dcc View commit details
    Browse the repository at this point in the history

  3. doctrineのアップデート

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    332ac0e View commit details
    Browse the repository at this point in the history

  4. EC-CUBE#1922 の修正が不要になったため削除

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    7b425b0 View commit details
    Browse the repository at this point in the history

  5. deprecatedを修正

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    071f280 View commit details
    Browse the repository at this point in the history

  6. インストーラのpgsql10対応

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    78af2a2 View commit details
    Browse the repository at this point in the history

  7. cs fix

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    4f779b9 View commit details
    Browse the repository at this point in the history

  8. swiftmailerを6.1に更新

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    9c43215 View commit details
    Browse the repository at this point in the history

  9. phpバージョンを更新

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    154d6b5 View commit details
    Browse the repository at this point in the history

  10. composer update

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    0c01912 View commit details
    Browse the repository at this point in the history

  11. cs fix

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    4e23178 View commit details
    Browse the repository at this point in the history

  12. unit test実行時に失敗するので修正

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    6d45c15 View commit details
    Browse the repository at this point in the history

  13. easy-log-handlerを1.0.3にダウングレード.

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    4e80903 View commit details
    Browse the repository at this point in the history

  14. インストーラを修正

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    8cf7ded View commit details
    Browse the repository at this point in the history

  15. hashの更新

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    a5e392d View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'upstream/experimental/sf' into modify-s… 

    …crutinizeryml
    @nanasess
    nanasess committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    0836683 View commit details
    Browse the repository at this point in the history

  17. Deleted

    @nanasess
    nanasess committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    201f477 View commit details
    Browse the repository at this point in the history

  18. マイページで表示できない受注が生成されるとテストに通らないため, 新規受付で生成するように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    f42cf81 View commit details
    Browse the repository at this point in the history

  19. remove excluded_paths in codeception/*

    @nanasess
    nanasess committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    1627fe0 View commit details
    Browse the repository at this point in the history

  20. OrderStatusMachineでOrderStatusのidが変更される問題の対応

    @kiy0taka
    kiy0taka committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    57ebe30 View commit details
    Browse the repository at this point in the history

  21. 不要なrefreshを削除

    @kiy0taka
    kiy0taka committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    38ceb65 View commit details
    Browse the repository at this point in the history

  22. Apply scrutinizer-patch

    @nanasess
    nanasess committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    361e254 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'modify-scrutinizeryml' into apply-codeceptions

    @nanasess
    nanasess committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    3410524 View commit details
    Browse the repository at this point in the history

  24. Include of codeception in paths

    @nanasess
    nanasess committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    a298555 View commit details
    Browse the repository at this point in the history

  25. Scrutinizer Auto-Fixes 

    This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
    @scrutinizer-auto-fixer
    scrutinizer-auto-fixer committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    2d14a35 View commit details
    Browse the repository at this point in the history

  26. Merge pull request EC-CUBE#30 from nanasess/scrutinizer-patch-4 

    Scrutinizer Auto-Fixes
    @nanasess
    nanasess authored Jul 25, 2018
    Configuration menu
    Copy the full SHA
    08b4c13 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. Merge pull request EC-CUBE#3402 from kiy0taka/sf/fix-order-state-machine 

    OrderStatusMachineでOrderStatusのidが変更される問題の対応
    Chihiro Adachi authored Jul 26, 2018
    Configuration menu
    Copy the full SHA
    048f3e7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/experimental/sf' into modify-s… 

    …crutinizeryml
    @nanasess
    nanasess committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    3e1f643 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/experimental/sf' into feature-… 

    …admin-htmlid
    @k-yamamura
    k-yamamura committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    c860286 View commit details
    Browse the repository at this point in the history

  4. Merge pull request EC-CUBE#3399 from kengo-kamon/experimental/261 

    EC-CUBE#261 【ご注文手続き】お届け日のプルダウンに曜日も出したい
    @ryo-endo
    ryo-endo authored Jul 26, 2018
    Configuration menu
    Copy the full SHA
    a2a3228 View commit details
    Browse the repository at this point in the history

  5. Merge pull request EC-CUBE#3400 from kengo-kamon/experimental/286 

    EC-CUBE#286 【ご注文履歴詳細】受注管理から登録した値引きが表示されていない
    @ryo-endo
    ryo-endo authored Jul 26, 2018
    Configuration menu
    Copy the full SHA
    4ba2d9d View commit details
    Browse the repository at this point in the history

  6. 5【全般】右下に表示されている「ページトップ」へが、ページの先頭にいるときにも表示されている

    naganuma mitsuhiro authored and naganuma mitsuhiro committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    fdbc23c View commit details
    Browse the repository at this point in the history

  7. テストケースの修正、不要なファイルを削除

    @k-yamamura
    k-yamamura committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    7c4edcd View commit details
    Browse the repository at this point in the history

  8. スマホで子カテゴリを選択できない不具合の対応

    @tao-s
    tao-s authored Jul 26, 2018
    Configuration menu
    Copy the full SHA
    54b8f81 View commit details
    Browse the repository at this point in the history

  9. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    5a27f5f View commit details
    Browse the repository at this point in the history

  10. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    ecee38d View commit details
    Browse the repository at this point in the history

  11. fix ポイント計算 UpdatePointEventSubscriberではなくOrderStateMachineでポイント計算を統一

    @okazy
    okazy committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    90ab13e View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2018

  1. fix 受注登録画面 新規受注作成でOrder.idがなくエラーになってしまっていたバグを修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    fa548cf View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/experimental/sf' into feature-… 

    …admin-htmlid
    @k-yamamura
    k-yamamura committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    90c7517 View commit details
    Browse the repository at this point in the history

  3. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    4f6c2b4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request EC-CUBE#3409 from okazy/fix-order-new 

    【受注登録画面】新規受注作成でOrder.idがなくエラーになってしまっていたバグを修正
    Chihiro Adachi authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    099fe74 View commit details
    Browse the repository at this point in the history

  5. Merge pull request EC-CUBE#3401 from chihiro-adachi/improve/pgsql-10 

    PostgeSQL10に対応
    @ryo-endo
    ryo-endo authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    d58f474 View commit details
    Browse the repository at this point in the history

  6. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    c517820 View commit details
    Browse the repository at this point in the history

  7. delete PurchaseFlow Itemのエラー用商品名はthrowInvalidItemExceptionで生成しているため、使… 

    …用していないprocessor個別の関数を削除
    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    1dca920 View commit details
    Browse the repository at this point in the history

  8. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    a581ddd View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/experimental/sf' into fix-poin… 

    …t-calculation
    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    8c23b22 View commit details
    Browse the repository at this point in the history

  10. feat OrderItemのポイントの判定を「ポイント値引」の文字列一致からポイント専用のステータスを定義する方法に変更

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    b132ac2 View commit details
    Browse the repository at this point in the history

  11. Merge pull request EC-CUBE#3395 from naganuma-mitsuhiro/ec-cube5 

    5【全般】右下に表示されている「ページトップ」へが、ページの先頭にいるときにも表示されている
    @ryo-endo
    ryo-endo authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    1999421 View commit details
    Browse the repository at this point in the history

  12. For ES5

    @tao-s
    tao-s authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    6b7d805 View commit details
    Browse the repository at this point in the history

  13. feat 受注編集画面 加算ポイントは編集不要なのでフォームから削除

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    0b31738 View commit details
    Browse the repository at this point in the history

  14. feat PurchaseFlow ポイント操作を修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    8ed4aaf View commit details
    Browse the repository at this point in the history

  15. feat PurchaseFlow 利用ポイント変更に連動して会員のポイントが変更されるように修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    8d768fe View commit details
    Browse the repository at this point in the history

  16. feat PurchaseFlow ポイント操作を修正 UnitTestの修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    0878338 View commit details
    Browse the repository at this point in the history

  17. PSR-4 Autoloader に定義済みのため不要

    @nanasess
    nanasess committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    6ee0e69 View commit details
    Browse the repository at this point in the history

  18. feat PurchaseFlow 購入時のポイント操作の修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    c5df635 View commit details
    Browse the repository at this point in the history

  19. use class_exists

    @nanasess
    nanasess committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    d46778d View commit details
    Browse the repository at this point in the history

  20. テストケースの修正

    @k-yamamura
    k-yamamura committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    402647a View commit details
    Browse the repository at this point in the history

  21. fix PurchaseFlow 使用ポイントを0にしてもポイントの割引明細が削除されない不具合を修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    3893f25 View commit details
    Browse the repository at this point in the history

  22. コード整形

    @k-yamamura
    k-yamamura committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    9ae90bf View commit details
    Browse the repository at this point in the history

  23. fix PurchaseFlow ポイント使用で購入フローで金額がマイナスとなって進めない問題の修正

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    a399168 View commit details
    Browse the repository at this point in the history

  24. delete PurchaseFlowで行なっていた入金日、出荷日などの更新はOrderStateMachineで行うので不要になった処理を削除

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    5753198 View commit details
    Browse the repository at this point in the history

  25. feat ポイントのprocessorを購入フローと管理画面に分けてそれぞれ処理できるように変更

    @okazy
    okazy committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    77f9d1a View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2018

  1. 56最後のシステム管理者を非活動に変更できません

    @oywc410 @chihiro-adachi
    oywc410 authored and chihiro-adachi committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    3169fc0 View commit details
    Browse the repository at this point in the history

  2. メンバー管理で最後のユーザは非稼働に変更出来ないように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    6cc4112 View commit details
    Browse the repository at this point in the history

  3. 権限を見るように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    a643afe View commit details
    Browse the repository at this point in the history

  4. DQLの誤りを修正

    @chihiro-adachi
    chihiro-adachi committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    fb92371 View commit details
    Browse the repository at this point in the history

  5. 非稼働に設定時にチェックするように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    fc5f118 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. Merge pull request EC-CUBE#3307 from k-yamamura/bugfix-cart-add 

    規格、数量未入力でカート追加ボタン押下した時にエラーが出るようにする対応、カートへ追加した時にダイアログを表示する対応
    @kiy0taka
    kiy0taka authored Jul 30, 2018
    Configuration menu
    Copy the full SHA
    3a1a8cc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/experimental/sf' into fix-clas… 

    …sloader
    @nanasess
    nanasess committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    d526193 View commit details
    Browse the repository at this point in the history

  3. refactor run cs-fixer

    @okazy
    okazy committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    3672fed View commit details
    Browse the repository at this point in the history

  4. Fix debug bar error

    @lqdung-lockon
    lqdung-lockon committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    e285362 View commit details
    Browse the repository at this point in the history

  5. fix PointProcessorのUnitTestを修正

    @okazy
    okazy committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    70ef39c View commit details
    Browse the repository at this point in the history

  6. 発送日の更新はステートマシン外で行うように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    eea8416 View commit details
    Browse the repository at this point in the history

  7. Search page.

    @toannguyen-lockon
    toannguyen-lockon committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    36d696c View commit details
    Browse the repository at this point in the history

  8. EC-CUBE#70 【レイアウト管理】ブロック名をリンクを削除する(とび先がないので) テストケース修正

    @KenTanaka
    KenTanaka committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    1064394 View commit details
    Browse the repository at this point in the history

  9. feat pointDiffProcessor UnitTestを追加

    @okazy
    okazy committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    524d0c5 View commit details
    Browse the repository at this point in the history

  10. class_exists を削除するよう修正

    @nanasess
    nanasess committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    66d8a77 View commit details
    Browse the repository at this point in the history

  11. EC-CUBE#70 【レイアウト管理】ブロック名をリンクを削除する(とび先がないので) 未使用ブロック検索の修正

    @KenTanaka
    KenTanaka committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    fe213cf View commit details
    Browse the repository at this point in the history

  12. Apply php-cs-fixer

    @nanasess
    nanasess committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    a5326de View commit details
    Browse the repository at this point in the history

  13. /help/privacy

    @KenTanaka
    KenTanaka committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    ae49825 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/70
    @KenTanaka
    KenTanaka committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    63fb552 View commit details
    Browse the repository at this point in the history

  15. EC-CUBE#143 【プライバシーポリシー】文言の表示崩れ

    @kengo-kamon
    kengo-kamon committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    9d15172 View commit details
    Browse the repository at this point in the history

  16. EC-CUBE#70 【レイアウト管理】ブロック名をリンクを削除する(とび先がないので) テストケースの修正

    @KenTanaka
    KenTanaka committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    59f09c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2018

  1. feat pointDiffProcessor UnitTestを追加 cs-fixer適用、変数名改善

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    a2c10d5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request EC-CUBE#3421 from eccubevn/fix-debug-bar-error 

    Fix debug bar error
    Chihiro Adachi authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    7a99bf6 View commit details
    Browse the repository at this point in the history

  3. サンプルで入れていたtwigファイルを削除

    @ryo-endo
    ryo-endo committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    b2a74a0 View commit details
    Browse the repository at this point in the history

  4. feat pointProcessor UnitTestを追加 ポイント付与率とポイント換算レートのテストを追加

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    2afe8a1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request EC-CUBE#3424 from kengo-kamon/experimental/143 

    EC-CUBE#143 【プライバシーポリシー】文言の表示崩れ
    @ryo-endo
    ryo-endo authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    c937692 View commit details
    Browse the repository at this point in the history

  6. Fix out of range

    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    eef3baa View commit details
    Browse the repository at this point in the history

  7. Revert "PSR-4 Autoloader に定義済みのため不要" 

    This reverts commit 6ee0e69.
    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    900683f View commit details
    Browse the repository at this point in the history

  8. 帳票を出荷ごとに分ける対応

    @k-yamamura
    k-yamamura committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    397c4b7 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/70
    @KenTanaka
    KenTanaka committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    0757b5e View commit details
    Browse the repository at this point in the history

  10. 有効なプラグインがあるとデバッグツールバーがエラーになっていたのを修正

    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    38ee130 View commit details
    Browse the repository at this point in the history

  11. Merge pull request EC-CUBE#3426 from k-yamamura/feature-order-pdf 

    帳票を出荷ごとに分ける対応
    Chihiro Adachi authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f68e2bd View commit details
    Browse the repository at this point in the history

  12. Merge pull request EC-CUBE#3427 from nanasess/fix-toolbar-in-plugin 

    有効なプラグインがあるとデバッグツールバーがエラーになっていたのを修正
    @ryo-endo
    ryo-endo authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    c429159 View commit details
    Browse the repository at this point in the history

  13. Merge pull request EC-CUBE#3406 from tao-s/patch-5 

    スマホで子カテゴリを選択できない不具合の対応
    @ryo-endo
    ryo-endo authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    080d01e View commit details
    Browse the repository at this point in the history

  14. feat 出荷登録画面　お届け先自体の削除を可能にする

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    6c332d0 View commit details
    Browse the repository at this point in the history

  15. Add box search for block content.

    @toannguyen-lockon
    toannguyen-lockon committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    b94120a View commit details
    Browse the repository at this point in the history

  16. Merge branch 'experimental/sf' into ec-cube145 

    # Conflicts:
#	html/template/default/assets/css/component/3.1.inputText.min.css
#	html/template/default/assets/css/component/3.2.inputMisc.min.css
#	html/template/default/assets/css/style.min.css
    naganuma mitsuhiro authored and naganuma mitsuhiro committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    8590f22 View commit details
    Browse the repository at this point in the history

  17. Merge pull request EC-CUBE#3396 from k-yamamura/feature-admin-htmlid 

    管理画面のhtmlタグにIDを設定、不要なファイルを削除
    Chihiro Adachi authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    9074f5a View commit details
    Browse the repository at this point in the history

  18. fix ポイント機能改修　レビュー箇所の修正 

    EC-CUBE#3416 (review)
    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    aa1660d View commit details
    Browse the repository at this point in the history

  19. Fix path separator on Windows

    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    398e01c View commit details
    Browse the repository at this point in the history

  20. Apply php-cs-fixer

    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    0d0a57c View commit details
    Browse the repository at this point in the history

  21. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into sf-w30-content-page-search

# Conflicts:
#	src/Eccube/Resource/template/admin/Content/page.twig
    @toannguyen-lockon
    toannguyen-lockon committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    b3fccdf View commit details
    Browse the repository at this point in the history

  22. Fix: Conflicts

    @toannguyen-lockon
    toannguyen-lockon committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    86c0cf8 View commit details
    Browse the repository at this point in the history

  23. fix 配送編集画面 配送削除ボタンのデザインを文字ありのボタンに変更

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    006b56c View commit details
    Browse the repository at this point in the history

  24. fix 配送編集画面 画面表示時にサイドメニューの受注登録が選択されるようにする 

    配送先の新規登録画面はないためメニューには追加しない
    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    3825a55 View commit details
    Browse the repository at this point in the history

  25. Merge pull request EC-CUBE#3416 from okazy/fix-point-calculation 

    ポイント機能の改修
    Chihiro Adachi authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    fbc4785 View commit details
    Browse the repository at this point in the history

  26. TaxRuleIdとRoundingTypeを保持するように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    5898461 View commit details
    Browse the repository at this point in the history

  27. 受注登録画面の税の計算処理を修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    c6d23b6 View commit details
    Browse the repository at this point in the history

  28. TaxProcessorをpublicに修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    92444e1 View commit details
    Browse the repository at this point in the history

  29. コミット漏れ

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    ed3fe76 View commit details
    Browse the repository at this point in the history

  30. TaxProcessorで税データを生成するように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    5ac7784 View commit details
    Browse the repository at this point in the history

  31. 未使用関数の削除

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    54e87e8 View commit details
    Browse the repository at this point in the history

  32. total_priceを使用するように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    5fcc9fd View commit details
    Browse the repository at this point in the history

  33. 税の集計処理を修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    95d2b3d View commit details
    Browse the repository at this point in the history

  34. cs fix

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    06aefa6 View commit details
    Browse the repository at this point in the history

  35. 不要ファイルの削除

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    57629f9 View commit details
    Browse the repository at this point in the history

  36. テストの修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    e0ddda1 View commit details
    Browse the repository at this point in the history

  37. PDFの明細を修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f8b1ae0 View commit details
    Browse the repository at this point in the history

  38. TaxProcessorで税区分・税表示区分を制御するように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    478fa9c View commit details
    Browse the repository at this point in the history

  39. テストの修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    ec15ee4 View commit details
    Browse the repository at this point in the history

  40. TaxProcessorをHolderProcessorに変更

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    2560744 View commit details
    Browse the repository at this point in the history

  41. 税計算をTaxProcessorで行うように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    487f27b View commit details
    Browse the repository at this point in the history

  42. デバッグコード削除

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    e1ab15f View commit details
    Browse the repository at this point in the history

  43. 不要なテストケースを削除

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    b280e87 View commit details
    Browse the repository at this point in the history

  44. 税額の集計誤りを修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    9c4bd86 View commit details
    Browse the repository at this point in the history

  45. 削除した関数を戻す

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    26e369a View commit details
    Browse the repository at this point in the history

  46. 不要な処理を削除

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    5aa865f View commit details
    Browse the repository at this point in the history

  47. テストの修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    000d2a6 View commit details
    Browse the repository at this point in the history

  48. 明細の金額・個数のバリデーションを行うように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    7b58b5e View commit details
    Browse the repository at this point in the history

  49. 内値引きにマイナスをつけるように修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    2630875 View commit details
    Browse the repository at this point in the history

  50. テストの修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    da76126 View commit details
    Browse the repository at this point in the history

  51. Merge pull request EC-CUBE#3423 from chihiro-adachi/fix-statemachine 

    発送日の更新をステートマシン外で行うように修正
    @kiy0taka
    kiy0taka authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    690bfab View commit details
    Browse the repository at this point in the history

  52. fix 配送編集画面 商品明細が登録されていない場合にエラーを出すように修正

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    0248b78 View commit details
    Browse the repository at this point in the history

  53. Merge remote-tracking branch 'upstream/experimental/sf' into fix-clas… 

    …sloader
    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    97484d5 View commit details
    Browse the repository at this point in the history

  54. Merge remote-tracking branch 'upstream/experimental/sf' into modify-s… 

    …crutinizeryml
    @nanasess
    nanasess committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    3cdfe20 View commit details
    Browse the repository at this point in the history

  55. Merge pull request EC-CUBE#3389 from KenTanaka/experimental/70 

    EC-CUBE#70 【レイアウト管理】ブロック名をリンクを削除する(とび先がないので)
    @ryo-endo
    ryo-endo authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f83f0bd View commit details
    Browse the repository at this point in the history

  56. fix 配送編集画面以外では配送先の商品明細必須チェックをしない

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    a94af3d View commit details
    Browse the repository at this point in the history

  57. ポイントの処理を組み込み

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    ce824b2 View commit details
    Browse the repository at this point in the history

  58. $kernel->terminate()でキャッシュを削除するように変更

    @kiy0taka
    kiy0taka committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f529351 View commit details
    Browse the repository at this point in the history

  59. テストの修正

    @chihiro-adachi
    chihiro-adachi committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    1fce3a4 View commit details
    Browse the repository at this point in the history

  60. Merge pull request EC-CUBE#3388 from naganuma-mitsuhiro/ec-cube145 

    145【共通】郵便番号・電話番号入力フォームのプレースホルダーの文言を変更したい
    @ryo-endo
    ryo-endo authored Jul 31, 2018
    Configuration menu
    Copy the full SHA
    98297fa View commit details
    Browse the repository at this point in the history

  61. fix 配送編集画面 e2eテストが通るように修正

    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    891af49 View commit details
    Browse the repository at this point in the history

  62. Merge remote-tracking branch 'upstream/experimental/sf' into feat-del… 

    …ete-shipping
    @okazy
    okazy committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    2fbcec7 View commit details
    Browse the repository at this point in the history

  63. EC-CUBE#264 【商品編集】フロントの商品ページを見ることができる「確認ボタン」の追加

    @KenTanaka
    KenTanaka committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f19a832 View commit details
    Browse the repository at this point in the history

  64. EC-CUBE#264 【商品編集】フロントの商品ページを見ることができる「確認ボタン」の追加

    @KenTanaka
    KenTanaka committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    9432d9f View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Merge pull request EC-CUBE#3420 from chihiro-adachi/improve/tax 

    税計算をPurchaseFlowで行うように修正
    @kiy0taka
    kiy0taka authored Aug 1, 2018
    Configuration menu
    Copy the full SHA
    34ef732 View commit details
    Browse the repository at this point in the history

  2. fix 配送編集画面 merge時のコンフリクト解消漏れを修正

    @okazy
    okazy committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    2e34c04 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/experimental/sf' into modify-s… 

    …crutinizeryml
    @nanasess
    nanasess committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    2eb4729 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/experimental/sf' into fix-clas… 

    …sloader
    @nanasess
    nanasess committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    babfb80 View commit details
    Browse the repository at this point in the history

  5. Fix use

    @nanasess
    nanasess committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    1e29108 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/76
    @KenTanaka
    KenTanaka committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    e63ec67 View commit details
    Browse the repository at this point in the history

  7. EC-CUBE#76 【ファイル管理】ドットファイルが表示されない テストケース修正

    @KenTanaka
    KenTanaka committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    3b8496f View commit details
    Browse the repository at this point in the history

  8. Apply scrutinizer patchs

    @nanasess
    nanasess committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    2b99300 View commit details
    Browse the repository at this point in the history

  9. Merge pull request EC-CUBE#3236 from nanasess/modify-scrutinizeryml 

    .scrutinizser.yml の修正
    @ryo-endo
    ryo-endo authored Aug 1, 2018
    Configuration menu
    Copy the full SHA
    4846476 View commit details
    Browse the repository at this point in the history

  10. contentsmanagement_ページ管理のテストがタイミングによって失敗するのを修正

    @kiy0taka
    kiy0taka committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    79dcacd View commit details
    Browse the repository at this point in the history

  11. Merge pull request EC-CUBE#3436 from kiy0taka/sf/fix-contentsmanageme… 

    …nt-page

contentsmanagement_ページ管理のテストがタイミングによって失敗するのを修正
    @okazy
    okazy authored Aug 1, 2018
    Configuration menu
    Copy the full SHA
    ae1fd82 View commit details
    Browse the repository at this point in the history

  12. PullRequest時はカバレッジを計測しないようにする

    @kiy0taka
    kiy0taka committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    2a3c1ee View commit details
    Browse the repository at this point in the history

  13. Fix unit test

    @lqdung-lockon
    lqdung-lockon committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    5f80647 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into sf-w30-customer-edit-hide-items-processing
    @lqdung-lockon
    lqdung-lockon committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    785712a View commit details
    Browse the repository at this point in the history

  15. Fix unit test

    @lqdung-lockon
    lqdung-lockon committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    703f20a View commit details
    Browse the repository at this point in the history

  16. ブロックでフックポイントを呼べるように修正

    @chihiro-adachi
    chihiro-adachi committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    4f89987 View commit details
    Browse the repository at this point in the history

  17. Add detach on test case

    @lqdung-lockon
    lqdung-lockon committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    4805647 View commit details
    Browse the repository at this point in the history

  18. issues EC-CUBE#3392 コントローラー付きのブロックを設置するとエラーが発生します

    @kengo-kamon
    kengo-kamon committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    e7d2691 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'experimental/sf' into oywc410-eccube4_56

    Chihiro Adachi authored Aug 1, 2018
    Configuration menu
    Copy the full SHA
    2c6cb6f View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. Merge pull request EC-CUBE#3355 from KenTanaka/experimental/76 

    【ファイル管理】ドットファイルが表示されない
    Chihiro Adachi authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    8db7d16 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/3392
    @kengo-kamon
    kengo-kamon committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    a19f139 View commit details
    Browse the repository at this point in the history

  3. mtb_customer_order_statusに初期データを追加

    @k-yamamura
    k-yamamura committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    e8de18e View commit details
    Browse the repository at this point in the history

  4. EC-CUBE#265 【カテゴリ管理】画面右のツリーで選択中の項目をわかるように表示する 

    選択中のカテゴリを、ボールド表示するようにする。
    @sai-kita
    sai-kita committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    aa3a576 View commit details
    Browse the repository at this point in the history

  5. Merge pull request EC-CUBE#3407 from chihiro-adachi/oywc410-eccube4_56 

    メンバー管理で最後のシステム管理者は非稼働に変更出来ないように修正
    @ryo-endo
    ryo-endo authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    03b5d11 View commit details
    Browse the repository at this point in the history

  6. Scrutinizerのカバレッジタイムアウトを1時間に設定

    @kiy0taka
    kiy0taka committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    e21a2fe View commit details
    Browse the repository at this point in the history

  7. Merge branch 'experimental/sf' into ec-cube117

    naganuma mitsuhiro authored and naganuma mitsuhiro committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    9df567b View commit details
    Browse the repository at this point in the history

  8. 117【 商品登録】カテゴリの表示崩れ（Firefox）

    naganuma mitsuhiro authored and naganuma mitsuhiro committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    78e4d91 View commit details
    Browse the repository at this point in the history

  9. EC-CUBE#157 【会員登録・編集会員管理】購入履歴＞対応状況の色表示を対応する

    @KenTanaka
    KenTanaka committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    28176da View commit details
    Browse the repository at this point in the history

  10. feat 管理画面サイドナビ has_childが不要な形に書き換え

    @okazy
    okazy committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    a9d97b0 View commit details
    Browse the repository at this point in the history

  11. Merge pull request EC-CUBE#3414 from okazy/delete-format-function 

    Itemのエラー用商品名はthrowInvalidItemExceptionで生成しているためprocessor個別の関数を削除
    @kiy0taka
    kiy0taka authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    6f8ad99 View commit details
    Browse the repository at this point in the history

  12. Merge pull request EC-CUBE#3415 from okazy/delete-updatedate-processor 

    PurchaseFlowで行なっていた入金日、出荷日などの更新はOrderStateMachineで行うので不要になった処理を削除
    @kiy0taka
    kiy0taka authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    eba3f5c View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'upstream/experimental/sf' into fix-clas… 

    …sloader
    @nanasess
    nanasess committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    c1c7563 View commit details
    Browse the repository at this point in the history

  14. Apply php-cs-fixer

    @nanasess
    nanasess committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    7673547 View commit details
    Browse the repository at this point in the history

  15. Merge pull request EC-CUBE#3446 from k-yamamura/feature-order-akaden 

    mtb_customer_order_statusに初期データを追加
    @kiy0taka
    kiy0taka authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    61ccb11 View commit details
    Browse the repository at this point in the history

  16. EC-CUBE#69 【ページ管理】新規作成時点で初期値として最低限のテンプレートを用意しておきたい

    @KenTanaka
    KenTanaka committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    10b05e5 View commit details
    Browse the repository at this point in the history

  17. Merge pull request EC-CUBE#3440 from kiy0taka/sf/skip-coverage-in-pr 

    Pull Request時はカバレッジを計測しないようにする
    @ryo-endo
    ryo-endo authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    69d7653 View commit details
    Browse the repository at this point in the history

  18. Merge pull request EC-CUBE#3433 from KenTanaka/experimental/264 

    EC-CUBE#264 【商品編集】フロントの商品ページを見ることができる「確認ボタン」の追加
    @ryo-endo
    ryo-endo authored Aug 2, 2018
    Configuration menu
    Copy the full SHA
    a63e5ff View commit details
    Browse the repository at this point in the history

  19. feat 管理画面サイドナビ 1,３階層目を拡張せきるように修正、それに伴ってeccube_navの構造見直し

    @okazy
    okazy committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    8e56a81 View commit details
    Browse the repository at this point in the history

  20. EC-CUBE#69 【ページ管理】新規作成時点で初期値として最低限のテンプレートを用意しておきたい

    @KenTanaka
    KenTanaka committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    88526ef View commit details
    Browse the repository at this point in the history

  21. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/69
    @KenTanaka
    KenTanaka committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    c4cdd47 View commit details
    Browse the repository at this point in the history

  22. EC-CUBE#69 【ページ管理】新規作成時点で初期値として最低限のテンプレートを用意しておきたい テストケース修正

    @KenTanaka
    KenTanaka committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    ba887eb View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2018

  1. Merge remote-tracking branch 'upstream/experimental/sf' into fix-clas… 

    …sloader
    @nanasess
    nanasess committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    1495b99 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'experimental/sf' into experimental/50

    Chihiro Adachi authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    39e61fd View commit details
    Browse the repository at this point in the history

  3. Merge pull request EC-CUBE#3384 from naganuma-mitsuhiro/ec-cube117 

    【 商品登録】カテゴリの表示崩れ（Firefox）
    Chihiro Adachi authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    3ca8be8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request EC-CUBE#3443 from kengo-kamon/experimental/3392 

    issues EC-CUBE#3392 コントローラー付きのブロックを設置するとエラーが発生します
    @okazy
    okazy authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    0de2cdd View commit details
    Browse the repository at this point in the history

  5. Merge pull request EC-CUBE#3441 from chihiro-adachi/improve/block-hook 

    コントローラのないtwigの拡張ができない問題の対応
    @okazy
    okazy authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    dd9b916 View commit details
    Browse the repository at this point in the history

  6. Merge pull request EC-CUBE#3438 from eccubevn/sf-w30-management-block… 

    …-search

【ブロック管理】数が増えるので絞り込みがほしい
    @ryo-endo
    ryo-endo authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    bdfefce View commit details
    Browse the repository at this point in the history

  7. BaseInfo をインジェクションしないよう修正

    @nanasess
    nanasess committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    1892f3b View commit details
    Browse the repository at this point in the history

  8. EC-CUBE#51 【メンバー管理】フォームのエラーメッセージがわかりにくい

    @sai-kita
    sai-kita committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    bc0a188 View commit details
    Browse the repository at this point in the history

  9. Merge pull request EC-CUBE#3429 from eccubevn/sf-w30-content-page-search 

    【ページ管理】検索窓があるが機能していない
    @ryo-endo
    ryo-endo authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    afd20c6 View commit details
    Browse the repository at this point in the history

  10. BaseInfo をインジェクションしないよう修正

    @nanasess
    nanasess committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    111068a View commit details
    Browse the repository at this point in the history

  11. Merge pull request EC-CUBE#3449 from KenTanaka/experimental/157 

    EC-CUBE#157 【会員登録・編集会員管理】購入履歴＞対応状況の色表示を対応する
    @ryo-endo
    ryo-endo authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    49afffd View commit details
    Browse the repository at this point in the history

  12. EC-CUBE#107 【商品管理/商品登録】画像の順番が不明

    @sai-kita
    sai-kita committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    03bf267 View commit details
    Browse the repository at this point in the history

  13. 修正漏れ

    @nanasess
    nanasess committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    e7ab7d9 View commit details
    Browse the repository at this point in the history

  14. Apply php-cs-fixer

    @nanasess
    nanasess committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    5807168 View commit details
    Browse the repository at this point in the history

  15. Fix typo

    @nanasess
    nanasess committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    2e60751 View commit details
    Browse the repository at this point in the history

  16. EC-CUBE#257 商品規格の並び方が管理画面/フロントで異なる

    @sai-kita
    sai-kita committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    0afd6fa View commit details
    Browse the repository at this point in the history

  17. Merge pull request EC-CUBE#3412 from nanasess/fix-classloader 

    Proxy クラスを利用すると、 Windows 環境で動作しない不具合の対応
    @ryo-endo
    ryo-endo authored Aug 3, 2018
    Configuration menu
    Copy the full SHA
    1709120 View commit details
    Browse the repository at this point in the history

  18. EC-CUBE#257 商品規格の並び方が管理画面/フロントで異なる

    @sai-kita
    sai-kita committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    1c19026 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/107
    @sai-kita
    sai-kita committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    fa439f1 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'experimental/sf' of https://github.com/EC-CUBE/ec-cube … 

    …into experimental/51
    @sai-kita
    sai-kita committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    c9bd7ba View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2018

  1. refactor 管理画面サイドナビ child -> children

    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    c5741bb View commit details
    Browse the repository at this point in the history

  2. feat NavCompilerPassのテストを追加

    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    336075f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/experimental/sf' into feat-nav… 

    …-api
    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    5b3178d View commit details
    Browse the repository at this point in the history

  4. composer1.7対応 

    See symfony/flex#405
    @kiy0taka
    kiy0taka committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    e56c5b2 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'kiy0taka/sf/fix-composer17' into feat-n… 

    …av-api
    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    7bdc452 View commit details
    Browse the repository at this point in the history

  6. Merge pull request EC-CUBE#3456 from kiy0taka/sf/fix-composer17 

    composer 1.7 対応
    @okazy
    okazy authored Aug 4, 2018
    Configuration menu
    Copy the full SHA
    2c9648a View commit details
    Browse the repository at this point in the history

  7. fix e2e 受注管理/出荷管理の商品検索 不要なwaitが入っていたので削除

    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    753f02f View commit details
    Browse the repository at this point in the history

  8. refactor 受注管理編集画面のUnitTestのFormDataを再利用可能な形に変更

    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    3ec9b77 View commit details
    Browse the repository at this point in the history

  9. delete 出荷編集画面UnitTest 出荷完了処理・出荷完了メールは受注一覧機能と同じ機能を使っているため出荷編集画面のUnitTe… 

    …stから削除、また出荷日は削除不可となったためUnitTestから削除
    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    fb5f4e3 View commit details
    Browse the repository at this point in the history

  10. feat 出荷編集画面UnitTest 出荷先の追加・削除のテストケースを追加

    @okazy
    okazy committed Aug 4, 2018
    Configuration menu
    Copy the full SHA
    af5de63 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2018

  1. Merge pull request EC-CUBE#3376 from KenTanaka/experimental/50 

    EC-CUBE#50 【権限設定】拒否URLに部分一致のページはメニューに表示されるがアクセスできない
    Chihiro Adachi authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    be7f7d0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request EC-CUBE#3450 from okazy/feat-nav-api 

    【管理画面サイドナビ】1,3階層目を拡張できるように修正、それに伴ってeccube_navの構造見直し
    Chihiro Adachi authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    833c28e View commit details
    Browse the repository at this point in the history

  3. Merge pull request EC-CUBE#3444 from eccubevn/sf-w30-customer-edit-hi… 

    …de-items-processing

【管理画面/会員編集】購入履歴に購入処理中のものまで表示される
    @ryo-endo
    ryo-endo authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    c9c06db View commit details
    Browse the repository at this point in the history

  4. Merge pull request EC-CUBE#3447 from sai-kita/experimental/265 

    EC-CUBE#265 【カテゴリ管理】画面右のツリーで選択中の項目をわかるように表示する
    @ryo-endo
    ryo-endo authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    cc4ff3d View commit details
    Browse the repository at this point in the history

  5. Merge pull request EC-CUBE#3451 from KenTanaka/experimental/69 

    EC-CUBE#69 【ページ管理】新規作成時点で初期値として最低限のテンプレートを用意しておきたい
    @ryo-endo
    ryo-endo authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    99deddf View commit details
    Browse the repository at this point in the history

  6. Merge pull request EC-CUBE#3453 from sai-kita/experimental/51 

    EC-CUBE#51 【メンバー管理】フォームのエラーメッセージがわかりにくい
    @ryo-endo
    ryo-endo authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    ea00f54 View commit details
    Browse the repository at this point in the history

  7. Merge pull request EC-CUBE#3454 from sai-kita/experimental/107 

    EC-CUBE#107 【商品管理/商品登録】画像の順番が不明
    @ryo-endo
    ryo-endo authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    fde0569 View commit details
    Browse the repository at this point in the history

  8. Merge pull request EC-CUBE#3455 from sai-kita/experimental/257 

     EC-CUBE#257 商品規格の並び方が管理画面/フロントで異なる
    @ryo-endo
    ryo-endo authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    e6c9add View commit details
    Browse the repository at this point in the history

  9. Merge pull request EC-CUBE#3428 from okazy/feat-delete-shipping 

    【出荷登録画面】お届け先自体の削除機能追加
    Chihiro Adachi authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    549caa8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request EC-CUBE#3403 from ryo-endo/remove_sample_twig 

    サンプルとして入っていたスマホ用のtwigファイルを削除
    Chihiro Adachi authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    0008459 View commit details
    Browse the repository at this point in the history