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

master の変更をマージ #180

Merged
merged 23 commits into from
Jan 5, 2018
Merged

master の変更をマージ #180

merged 23 commits into from
Jan 5, 2018

Commits on Jan 1, 2016

  1. Fix issue of #63

    migarashi committed Jan 1, 2016
    Configuration menu
    Copy the full SHA
    a95ff4c View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2016

  1. fix issue of #54

    migarashi committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    27c5ebf View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. SC_CartSession::getAllProductsPoint() で Warning 発生 #85

    @seasoftjapan
    seasoftjapan committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    49d3bcf View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2016

  1. Flexible SSLへの対応

    @nobuhiko
    nobuhiko committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    bb8abe5 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2016

  1. フォーラムより 

    see
http://xoops.ec-cube.net/modules/newbb/viewtopic.php?topic_id=17426&forum=9&post_id=75948#forumpost75948
    @nobuhiko
    nobuhiko committed May 16, 2016
    Configuration menu
    Copy the full SHA
    f5e2a65 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

  1. Update SC_CartSession.php

    @kurozumi
    kurozumi authored Dec 1, 2016
    Configuration menu
    Copy the full SHA
    240be35 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Merge pull request #97 from nobuhiko/fix_order_search 

    フォーラムより 2.13.5 受注管理で登録ができない
    @ryo-endo
    ryo-endo authored Oct 25, 2017
    Configuration menu
    Copy the full SHA
    803f714 View commit details
    Browse the repository at this point in the history

  2. Travis-ci修正

    @ryo-endo
    ryo-endo authored Oct 25, 2017
    Configuration menu
    Copy the full SHA
    27f3037 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. AppVeyor設定修正

    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    1bbc5c1 View commit details
    Browse the repository at this point in the history

  2. ReadmeにAppVeyorのバッジを追加

    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    32385f9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request EC-CUBE#177 from ryo-endo/fix_ci_error 

    Travis-CI,AppVeyorがテスト通るように設定修正
    @t-nagahashi
    t-nagahashi authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    7dbee0a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #79 from migarashi47/issue_063 

    Fix issue of #63
    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    f934b8e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #80 from migarashi47/issue_54 

    fix issue of #54
    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    0fcd262 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #83 from seasoftjapan/#82 

    無効な支払方法で購入手続きを通過できる #82
    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    d426b62 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #86 from seasoftjapan/#85 

    SC_CartSession::getAllProductsPoint() で Warning 発生 #85
    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    8e94868 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #88 from nobuhiko/supported_Flexible_SSL 

    Flexible SSLへの対応
    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    5ed0532 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #108 from kurozumi/patch-1 

    delProductKeyメソッドでキーが最大値の商品が削除できませんでした
    @ryo-endo
    ryo-endo authored Oct 26, 2017
    Configuration menu
    Copy the full SHA
    333f30d View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2017

  1. Merge remote-tracking branch 'upstream/master' into merge-from-master 

     Conflicts:
	.travis.yml
    @nanasess
    nanasess committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    28956b4 View commit details
    Browse the repository at this point in the history

  2. Use Trusty on travis-ci

    @nanasess
    nanasess committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    7805983 View commit details
    Browse the repository at this point in the history

  3. Display error.log using tail

    @nanasess
    nanasess committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    18bb8b7 View commit details
    Browse the repository at this point in the history

  4. Add PHP7.2

    @nanasess
    nanasess committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    579fc97 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2018

  1. Fix composer install

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

  2. Use sudo: false

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