Changeset 21390

Timestamp:

2012/01/06 19:54:03 (11 years ago)

Author:

kotani

Message:

Merge from version-2_11-dev

Location:

branches/version-2_12-dev/data

Files:

• Smarty/templates/admin/contents/recommend.tpl (modified) (view diffs)
• Smarty/templates/sphone/cart/index.tpl (modified) (view diffs)
• class/SC_Customer.php (modified) (view diffs)
• class/SC_Initial.php (modified) (view diffs)
• class/SC_Product.php (modified) (view diffs)
• class/SC_Query.php (modified) (view diffs)
• class/helper/SC_Helper_Customer.php (modified) (view diffs)
• class/helper/SC_Helper_DB.php (modified) (view diffs)
• class/helper/SC_Helper_Mobile.php (modified) (view diffs)
• class/helper/SC_Helper_PageLayout.php (modified) (view diffs)
• class/helper/SC_Helper_Purchase.php (modified) (view diffs)
• class/helper/SC_Helper_Session.php (modified) (view diffs)
• class/pages/admin/basis/LC_Page_Admin_Basis.php (modified) (view diffs)
• class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (modified) (view diffs)
• class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (modified) (view diffs)
• class/pages/admin/design/LC_Page_Admin_Design.php (modified) (view diffs)
• class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (modified) (view diffs)
• class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (modified) (view diffs)
• class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Settings.php (modified) (view diffs)
• class/pages/admin/products/LC_Page_Admin_Products_Category.php (modified) (view diffs)
• class/pages/admin/products/LC_Page_Admin_Products_Product.php (modified) (view diffs)
• class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (view diffs)
• class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (modified) (view diffs)
• class/pages/admin/system/LC_Page_Admin_System_Editdb.php (modified) (view diffs)
• class/pages/admin/system/LC_Page_Admin_System_Input.php (modified) (view diffs)
• class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php (modified) (view diffs)
• class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php (modified) (view diffs)
• class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (modified) (view diffs)
• class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php (modified) (view diffs)
• class/pages/mypage/LC_Page_Mypage_Favorite.php (modified) (view diffs)
• class/pages/products/LC_Page_Products_Detail.php (modified) (view diffs)
• class/pages/products/LC_Page_Products_List.php (modified) (view diffs)
• class/pages/products/LC_Page_Products_Review.php (modified) (view diffs)
• class/pages/shopping/LC_Page_Shopping.php (modified) (view diffs)
• class/pages/upgrade/LC_Page_Upgrade_Download.php (modified) (view diffs)
• class/util/SC_Utils.php (modified) (view diffs)
• downloads (modified) (view diffs)