Changeset 18910 for branches/camp/camp-2_5-A
- Timestamp:
- 2010/11/06 10:20:24 (13 years ago)
- Location:
- branches/camp/camp-2_5-A
- Files:
-
- 11 deleted
- 26 edited
- 45 copied
-
. (modified) (view diffs)
-
data/Smarty/templates/admin/admin_popup_header.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/basis/index.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/contents/file_manager.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/contents/page_edit.tpl (deleted)
-
data/Smarty/templates/admin/css/contents.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/customer/search_customer.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/design/index.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/login_frame.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/main_frame.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/ownersstore/index.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/products/category.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/products/confirm.tpl (modified) (view diffs)
-
data/Smarty/templates/admin/products/maker.tpl (modified) (view diffs)
-
data/Smarty/templates/default/campaign/active/header.tpl (modified) (view diffs)
-
data/Smarty/templates/default/campaign/end/header.tpl (modified) (view diffs)
-
data/Smarty/templates/default/popup_header.tpl (modified) (view diffs)
-
data/Smarty/templates/default/site_main.tpl (modified) (view diffs)
-
data/class/SC_View.php (modified) (view diffs)
-
data/class/helper/SC_Helper_DB.php (modified) (view diffs)
-
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (view diffs)
-
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (modified) (view diffs)
-
data/class/pages/error/LC_Page_Error_SystemError.php (modified) (view diffs)
-
data/class/pages/shopping/LC_Page_Shopping_Complete.php (modified) (view diffs)
-
html/install/sql/column_comment.sql (modified) (view diffs)
-
html/install/sql/table_comment.sql (modified) (view diffs)
-
html/user_data/packages/admin (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin) (view diffs)
-
html/user_data/packages/admin/css (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/css) (view diffs)
-
html/user_data/packages/admin/css/admin_contents.css (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css) (view diffs)
-
html/user_data/packages/admin/css/admin_file_manager.css (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/css/admin_file_manager.css) (view diffs)
-
html/user_data/packages/admin/img (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img) (view diffs)
-
html/user_data/packages/admin/img/basis (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/basis) (view diffs)
-
html/user_data/packages/admin/img/basis/zip_install_progress.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/basis/zip_install_progress.gif) (view diffs)
-
html/user_data/packages/admin/img/common (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/common) (view diffs)
-
html/user_data/packages/admin/img/common/pagetop.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/common/pagetop.gif) (view diffs)
-
html/user_data/packages/admin/img/contents (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents) (view diffs)
-
html/user_data/packages/admin/img/contents/admin_login_back.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/admin_login_back.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/admin_login_bottom.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/admin_login_bottom.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/admin_login_logo.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/admin_login_logo.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/admin_login_right.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/admin_login_right.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/admin_login_top.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/admin_login_top.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/btn_regist.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/btn_regist.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/btn_regist_on.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/btn_regist_on.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/file.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/file.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/folder_close.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/folder_close.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/folder_open.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/folder_open.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/folder_parent.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/folder_parent.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/head-bg.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/head-bg.jpg) (view diffs)
-
html/user_data/packages/admin/img/contents/minus.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/minus.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/normal.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/normal.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/plus.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/plus.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/space.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/space.gif) (view diffs)
-
html/user_data/packages/admin/img/contents/subtitle_back.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/contents/subtitle_back.gif) (view diffs)
-
html/user_data/packages/admin/img/header (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header) (view diffs)
-
html/user_data/packages/admin/img/header/header_back.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/header_back.jpg) (view diffs)
-
html/user_data/packages/admin/img/header/logo.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/logo.jpg) (view diffs)
-
html/user_data/packages/admin/img/header/logout.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/logout.gif) (view diffs)
-
html/user_data/packages/admin/img/header/logout_on.gif (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/logout_on.gif) (view diffs)
-
html/user_data/packages/admin/img/header/navi_back.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/navi_back.jpg) (view diffs)
-
html/user_data/packages/admin/img/header/navi_on.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/navi_on.jpg) (view diffs)
-
html/user_data/packages/admin/img/header/navi_on_right.jpg (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/img/header/navi_on_right.jpg) (view diffs)
-
html/user_data/packages/admin/jquery.multiselect2side (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/jquery.multiselect2side) (view diffs)
-
html/user_data/packages/admin/jquery.multiselect2side/css (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/jquery.multiselect2side/css) (view diffs)
-
html/user_data/packages/admin/jquery.multiselect2side/css/jquery.multiselect2side.css (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/jquery.multiselect2side/css/jquery.multiselect2side.css) (view diffs)
-
html/user_data/packages/admin/jquery.multiselect2side/jmultiselect2side.html (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/jquery.multiselect2side/jmultiselect2side.html) (view diffs)
-
html/user_data/packages/admin/jquery.multiselect2side/js (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/jquery.multiselect2side/js) (view diffs)
-
html/user_data/packages/admin/jquery.multiselect2side/js/jquery.multiselect2side.js (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/jquery.multiselect2side/js/jquery.multiselect2side.js) (view diffs)
-
html/user_data/packages/admin/js (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/js) (view diffs)
-
html/user_data/packages/admin/js/admin.js (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js) (view diffs)
-
html/user_data/packages/admin/js/file_manager.js (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/js/file_manager.js) (view diffs)
-
html/user_data/packages/admin/js/ownersstore.js.php (copied) (copied from branches/version-2_5-dev/html/user_data/packages/admin/js/ownersstore.js.php) (view diffs)
-
html/user_data/packages/default/css/admin_contents.css (deleted)
-
html/user_data/packages/default/css/admin_file_manager.css (deleted)
-
html/user_data/packages/default/img/admin (deleted)
-
html/user_data/packages/default/img/contents/btn_regist.jpg (deleted)
-
html/user_data/packages/default/img/contents/btn_regist_on.jpg (deleted)
-
html/user_data/packages/default/img/contents/main_bar.jpg (deleted)
-
html/user_data/packages/default/jquery.multiselect2side (deleted)
-
html/user_data/packages/default/js/admin.js (deleted)
-
html/user_data/packages/default/js/file_manager.js (deleted)
-
html/user_data/packages/default/js/navi.js (modified) (view diffs)
-
html/user_data/packages/default/js/ownersstore.js.php (deleted)
-
branches/camp/camp-2_5-A
- Property svn:mergeinfo changed
/branches/version-2_5-dev (added) merged: 18889-18901
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
