Changeset 22144

Timestamp:

2012/12/17 14:25:58 (14 years ago)

Author:

h_yoshimoto

Message:

#1955 r22123 ～ r22143 間のコミットをmerge

Location:

branches/version-2_12-multilang

Files:

• . (modified) (view diffs)
• build.xml (copied) (copied from branches/version-2_12-dev/build.xml) (view diffs)
• data/Smarty/templates/admin/contents/recommend.tpl (modified) (view diffs)
• data/Smarty/templates/admin/total/index.tpl (modified) (view diffs)
• data/class/SC_CheckError.php (modified) (view diffs)
• data/class/SC_Customer.php (modified) (view diffs)
• data/class/helper/SC_Helper_HandleError.php (modified) (view diffs)
• data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (modified) (view diffs)
• data/class/pages/admin/products/LC_Page_Admin_Products.php (modified) (view diffs)
• data/class/pages/admin/total/LC_Page_Admin_Total.php (modified) (view diffs)
• data/class/pages/cart/LC_Page_Cart.php (modified) (view diffs)
• data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (modified) (view diffs)
• data/class/pages/shopping/LC_Page_Shopping_Confirm.php (modified) (view diffs)
• data/class/util/SC_Utils.php (modified) (view diffs)
• data/locales/ja.mo (modified) (view diffs)
• data/locales/ja.po (modified) (view diffs)
• eccube_install.sh (modified) (view diffs)
• tests (copied) (copied from branches/version-2_12-dev/tests) (view diffs)
• tests/class (copied) (copied from branches/version-2_12-dev/tests/class) (view diffs)
• tests/class/Common_TestCase.php (copied) (copied from branches/version-2_12-dev/tests/class/Common_TestCase.php) (view diffs)
• tests/class/helper (copied) (copied from branches/version-2_12-dev/tests/class/helper) (view diffs)
• tests/class/helper/SC_Helper_Purchase (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getDelivTimeTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPaymentsIdTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsByPriceTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getPaymentsTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php) (view diffs)
• tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php) (view diffs)
• tests/class/replace (copied) (copied from branches/version-2_12-dev/tests/class/replace) (view diffs)
• tests/class/replace/SC_Display_Ex.php (copied) (copied from branches/version-2_12-dev/tests/class/replace/SC_Display_Ex.php) (view diffs)
• tests/class/replace/SC_Response_Ex.php (copied) (copied from branches/version-2_12-dev/tests/class/replace/SC_Response_Ex.php) (view diffs)
• tests/class/test (copied) (copied from branches/version-2_12-dev/tests/class/test) (view diffs)
• tests/class/test/util (copied) (copied from branches/version-2_12-dev/tests/class/test/util) (view diffs)
• tests/class/test/util/Test_Utils.php (copied) (copied from branches/version-2_12-dev/tests/class/test/util/Test_Utils.php) (view diffs)
• tests/class/test/util/User_Utils.php (copied) (copied from branches/version-2_12-dev/tests/class/test/util/User_Utils.php) (view diffs)
• tests/class/util (copied) (copied from branches/version-2_12-dev/tests/class/util) (view diffs)
• tests/class/util/SC_Utils (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_encodeRFC3986Test.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getHash2ArrayTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getRealURLTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_getTableTagTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_getTableTagTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAbsoluteRealPathTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_isBlankTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isBlankTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonDecodeTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_jsonEncodeTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrayIntersectKeysTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDBDateToTimeTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfDispDBDateTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddPointTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCheckedTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetEnabledTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypeHmacTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetTimestampTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetUniqRandomIdTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsHTTPSTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMbConvertEncodingTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfMultiplyTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainListTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfNoImageMainTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPassLenTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfRmDupSlashTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php) (view diffs)
• tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTrimURLTest.php) (view diffs)
• tests/phpunit.xml.base (copied) (copied from branches/version-2_12-dev/tests/phpunit.xml.base) (view diffs)
• tests/phpunit.xml.jenkins (copied) (copied from branches/version-2_12-dev/tests/phpunit.xml.jenkins) (view diffs)
• tests/require.php.base (copied) (copied from branches/version-2_12-dev/tests/require.php.base) (view diffs)
• tests/require.php.jenkins (copied) (copied from branches/version-2_12-dev/tests/require.php.jenkins) (view diffs)
• tests/ruleset.xml (copied) (copied from branches/version-2_12-dev/tests/ruleset.xml) (view diffs)