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.

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

コピーライトの更新(2.13用) #239

Merged
merged 4 commits into from
Jan 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 22 additions & 18 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# Set build version format here instead of in the admin panel.
version: 2.13-dev-{build}

clone_folder: C:\projects\eccube2

cache:
- '%LOCALAPPDATA%\Composer\files'

Expand Down Expand Up @@ -41,24 +43,26 @@ install:
#- set PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin
#- mingw-get install mingw-developer-toolkit
## Set PHP.
- cinst php -version 5.6.17 --allow-empty-checksums
- SET PATH=C:\tools\php\;%PATH%
- copy C:\tools\php\php.ini-production C:\tools\php\php.ini
- echo date.timezone="Asia/Tokyo" >> C:\tools\php\php.ini
- echo extension_dir=ext >> C:\tools\php\php.ini
- echo extension=php_openssl.dll >> C:\tools\php\php.ini
- echo extension=php_gd2.dll >> C:\tools\php\php.ini
- echo extension=php_mbstring.dll >> C:\tools\php\php.ini
- echo extension=php_mysql.dll >> C:\tools\php\php.ini
- echo extension=php_pgsql.dll >> C:\tools\php\php.ini
- echo extension=php_curl.dll >> C:\tools\php\php.ini
- echo output_buffering = Off >> C:\tools\php\php.ini
- echo default_charset = UTF-8 >> C:\tools\php\php.ini
- echo mbstring.language = Japanese >> C:\tools\php\php.ini
- echo mbstring.encoding_translation = On >> C:\tools\php\php.ini
- echo mbstring.http_input = UTF-8 >> C:\tools\php\php.ini
- echo mbstring.http_output = pass >> C:\tools\php\php.ini
- echo mbstring.internal_encoding = UTF-8 >> C:\tools\php\php.ini
- cinst php --version 5.6.40 --allow-empty-checksums
- SET PATH=C:\tools\php56\;%PATH%
- cd C:\tools\php56
- copy php.ini-production php.ini
- echo date.timezone="Asia/Tokyo" >> php.ini
- echo extension_dir=ext >> php.ini
- echo extension=php_openssl.dll >> php.ini
- echo extension=php_gd2.dll >> php.ini
- echo extension=php_mbstring.dll >> php.ini
- echo extension=php_mysql.dll >> php.ini
- echo extension=php_pgsql.dll >> php.ini
- echo extension=php_curl.dll >> php.ini
- echo output_buffering = Off >> php.ini
- echo default_charset = UTF-8 >> php.ini
- echo mbstring.language = Japanese >> php.ini
- echo mbstring.encoding_translation = On >> php.ini
- echo mbstring.http_input = UTF-8 >> php.ini
- echo mbstring.http_output = pass >> php.ini
- echo mbstring.internal_encoding = UTF-8 >> php.ini
- cd C:\projects\eccube2
- php -r "readfile('https://getcomposer.org/installer');" | php
- php composer.phar install

Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/admin_popup_footer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/admin_popup_header.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/delivery.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/delivery_input.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/holiday.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/kiyaku.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/mail.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/payment.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/payment_input.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/point.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/subnavi.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/tradelaw.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/basis/zip_install.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/csv.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/csv_sql.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/csv_sql_view.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/file_manager.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/recommend.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/recommend_search.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/contents/subnavi.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/css/contents.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/customer/edit.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/customer/edit_complete.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/customer/edit_confirm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/customer/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/customer/search_customer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*
* This file is part of EC-CUBE
*
* Copyright(c) 2000-2014 LOCKON CO.,LTD. All Rights Reserved.
* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
*
* http://www.lockon.co.jp/
* http://www.ec-cube.co.jp/
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
Loading