Changeset 22278
- Timestamp:
- 2013/01/18 17:04:44 (14 years ago)
- Location:
- branches/version-2_12-multilang
- Files:
-
- 1 deleted
- 40 edited
- 34 copied
-
. (modified) (view diffs)
-
build.xml (modified) (view diffs)
-
data (modified) (view diffs)
-
data/Smarty/templates/default/contact/confirm.tpl (modified) (view diffs)
-
data/Smarty/templates/default/products/review_confirm.tpl (modified) (view diffs)
-
data/Smarty/templates/default_en-US/contact/confirm.tpl (modified) (view diffs)
-
data/Smarty/templates/default_en-US/products/review_confirm.tpl (modified) (view diffs)
-
data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (modified) (view diffs)
-
data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (modified) (view diffs)
-
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (view diffs)
-
html/install/index.php (modified) (view diffs)
-
tests (modified) (view diffs)
-
tests/class/SC_Date (copied) (copied from branches/version-2_12-dev/tests/class/SC_Date) (view diffs)
-
tests/class/SC_Product (copied) (copied from branches/version-2_12-dev/tests/class/SC_Product) (view diffs)
-
tests/class/SC_SiteSession (copied) (copied from branches/version-2_12-dev/tests/class/SC_SiteSession) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_clearShipmentItemTempTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingPrefTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isAddPointTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_isUsePointTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderNameColTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php (copied) (copied from branches/version-2_12-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetAllShippingTempTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php (modified) (view diffs)
-
tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetShippingTempTest.php (modified) (view diffs)
-
tests/class/test/util/Test_Utils.php (modified) (view diffs)
-
tests/class/test/util/User_Utils.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_clearCompliedTemplateTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_copyDirectoryTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_getTableTagTest.php (deleted)
-
tests/class/util/SC_Utils/SC_Utils_isAppInnerUrlTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_isInternalDomainTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_recursiveMkDirTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_repeatStrWithSeparatorTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfCalcIncTaxTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfCutStringTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfErrorHeaderTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfFlushTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetCSVListTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetCommaListTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetErrorColorTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetHashString_authTypePlainTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetRandomStringTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfGetSearchPageMaxTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfIsIntTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypeHmacTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsMatchHashPassword_authTypePlainTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfIsSucceessTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfIsZeroFillingTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfPrintRTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfSetErrorStyleTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfTaxTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfTermMonthTest.php) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfTrimTest.php (modified) (view diffs)
-
tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php (copied) (copied from branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfUpDirNameTest.php) (view diffs)
-
branches/version-2_12-multilang
- Property svn:mergeinfo changed
/branches/version-2_12-dev merged: 22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241 /branches/version-2_12_3 (added) merged: 22219,22229,22259-22261
- Property svn:mergeinfo changed
-
branches/version-2_12-multilang/data
-
branches/version-2_12-multilang/tests
- Property svn:ignore
-
old new 1 1 phpunit.xml 2 2 require.php 3 tmp 3 4
-
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.
