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

Conversation

nanasess
Copy link
Contributor

@nanasess nanasess commented Dec 31, 2017 •
edited
Loading

migarashi and others added 22 commits January 1, 2016 16:58
Fix issue of #63
a95ff4c
fix issue of #54
27c5ebf
@seasoftjapan
SC_CartSession::getAllProductsPoint() で Warning 発生 #85
49d3bcf
@nobuhiko
Flexible SSLへの対応
bb8abe5
@nobuhiko
フォーラムより
f5e2a65 
see
http://xoops.ec-cube.net/modules/newbb/viewtopic.php?topic_id=17426&forum=9&post_id=75948#forumpost75948
@kurozumi
Update SC_CartSession.php
240be35
@ryo-endo
Merge pull request #97 from nobuhiko/fix_order_search
803f714 
フォーラムより 2.13.5 受注管理で登録ができない
@ryo-endo
Travis-ci修正
27f3037
@ryo-endo
AppVeyor設定修正
1bbc5c1
@ryo-endo
ReadmeにAppVeyorのバッジを追加
32385f9
@t-nagahashi
Merge pull request EC-CUBE#177 from ryo-endo/fix_ci_error
7dbee0a 
Travis-CI,AppVeyorがテスト通るように設定修正
@ryo-endo
Merge pull request #79 from migarashi47/issue_063
f934b8e 
Fix issue of #63
@ryo-endo
Merge pull request #80 from migarashi47/issue_54
0fcd262 
fix issue of #54
@ryo-endo
Merge pull request #83 from seasoftjapan/#82
d426b62 
無効な支払方法で購入手続きを通過できる #82
@ryo-endo
Merge pull request #86 from seasoftjapan/#85
8e94868 
SC_CartSession::getAllProductsPoint() で Warning 発生 #85
@ryo-endo
Merge pull request #88 from nobuhiko/supported_Flexible_SSL
5ed0532 
Flexible SSLへの対応
@ryo-endo
Merge pull request #108 from kurozumi/patch-1
333f30d 
delProductKeyメソッドでキーが最大値の商品が削除できませんでした
@nanasess
Merge remote-tracking branch 'upstream/master' into merge-from-master
28956b4 
 Conflicts:
	.travis.yml
@nanasess
Use Trusty on travis-ci
7805983
@nanasess
Display error.log using tail
18bb8b7
@nanasess
Add PHP7.2
579fc97
@nanasess
Fix composer install
f59782b
@ryo-endo ryo-endo merged commit 97eb2dc into EC-CUBE:improve/php7 Jan 5, 2018
@ryo-endo ryo-endo mentioned this pull request Jan 5, 2018
Closed
@nanasess nanasess deleted the merge-from-master branch May 23, 2019 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ready-for-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nanasess @ryo-endo @seasoftjapan @nobuhiko @kurozumi @t-nagahashi