Index: branches/RC/admin/install/upgrades/changelog_4_2_0.txt =================================================================== diff -u -r9143 -r9169 --- branches/RC/admin/install/upgrades/changelog_4_2_0.txt (.../changelog_4_2_0.txt) (revision 9143) +++ branches/RC/admin/install/upgrades/changelog_4_2_0.txt (.../changelog_4_2_0.txt) (revision 9169) @@ -5,15 +5,16 @@ File in-portal/admin/install/theme_select.php changed File in-portal/admin/install/langpacks/english.lang changed File in-portal/admin/install/upgrades/changelog_.txt is removed; release_4_1_0 revision 1.1 -File in-portal/admin/install/upgrades/changelog_4_2_0.txt is new; release_4_2_0 revision 1.1.2.8 +File in-portal/admin/install/upgrades/changelog_4_2_0.txt is new; release_4_2_0 revision 1.1.2.9 File in-portal/admin/install/upgrades/inportal_upgrade_v4.2.0.php is new; release_4_2_0 revision 1.1.2.1 File in-portal/admin/install/upgrades/inportal_upgrade_v4.2.0.sql is new; release_4_2_0 revision 1.1.6.2 -File in-portal/admin/install/upgrades/readme_4_2_0.txt is new; release_4_2_0 revision 1.1 +File in-portal/admin/install/upgrades/readme_4_2_0.txt is new; release_4_2_0 revision 1.1.2.1 File in-portal/kernel/action.php changed File in-portal/kernel/admin_templates/advanced_view.tpl changed File in-portal/kernel/admin_templates/catalog.tpl changed File in-portal/kernel/admin_templates/catalog_tab.tpl changed File in-portal/kernel/admin_templates/group_selector.tpl changed +File in-portal/kernel/admin_templates/help.tpl is removed; release_4_1_0 revision 1.7 File in-portal/kernel/admin_templates/kernel_form_end.tpl changed File in-portal/kernel/admin_templates/no_permission.tpl changed File in-portal/kernel/admin_templates/user_selector.tpl is removed; release_4_1_0 revision 1.5 @@ -117,6 +118,7 @@ File in-portal/themes/default/forgotpw_confirm.tpl changed File kernel.X/core/install.php changed File kernel.X/core/admin_templates/SWFUpload.swf is new; release_4_2_0 revision 1.1 +File kernel.X/core/admin_templates/help.tpl is new; release_4_2_0 revision 1.1.2.1 File kernel.X/core/admin_templates/login.tpl changed File kernel.X/core/admin_templates/no_permission.tpl changed File kernel.X/core/admin_templates/sections_list.tpl changed @@ -173,7 +175,7 @@ File kernel.X/core/install/install_schema.sql changed File kernel.X/core/install/upgrades.php changed File kernel.X/core/install/upgrades.sql changed -File kernel.X/core/install/utf.php is new; release_4_2_0 revision 1.2 +File kernel.X/core/install/utf.php is new; release_4_2_0 revision 1.2.2.1 File kernel.X/core/install/step_templates/db_config.tpl changed File kernel.X/core/units/admin/admin_events_handler.php changed File kernel.X/core/units/admin/admin_tag_processor.php changed @@ -252,8 +254,8 @@ File theme_portal2007/index.tpl is new; release_4_2_0 revision 1.8.2.3 File theme_portal2007/no_permission.tpl is new; release_4_2_0 revision 1.5 File theme_portal2007/phrases_edit.tpl is new; release_4_2_0 revision 1.9.2.2 -File theme_portal2007/in-commerce/detail.tpl is new; release_4_2_0 revision 1.7.2.5 -File theme_portal2007/in-commerce/index.tpl is new; release_4_2_0 revision 1.4.2.3 +File theme_portal2007/in-commerce/detail.tpl is new; release_4_2_0 revision 1.7.2.6 +File theme_portal2007/in-commerce/index.tpl is new; release_4_2_0 revision 1.4.2.4 File theme_portal2007/in-commerce/module_info.xml is new; release_4_2_0 revision 1.1 File theme_portal2007/in-commerce/checkout/billing.tpl is new; release_4_2_0 revision 1.11.2.1 File theme_portal2007/in-commerce/checkout/checkout_success.tpl is new; release_4_2_0 revision 1.12.2.1 @@ -265,7 +267,7 @@ File theme_portal2007/in-commerce/designs/affiliates.tpl is new; release_4_2_0 revision 1.3.2.2 File theme_portal2007/in-commerce/designs/orders.tpl is new; release_4_2_0 revision 1.7 File theme_portal2007/in-commerce/designs/product_files.tpl is new; release_4_2_0 revision 1.4 -File theme_portal2007/in-commerce/designs/products.tpl is new; release_4_2_0 revision 1.19.2.6 +File theme_portal2007/in-commerce/designs/products.tpl is new; release_4_2_0 revision 1.19.2.8 File theme_portal2007/in-commerce/elements/affiliate_date_filter.tpl is new; release_4_2_0 revision 1.4.2.2 File theme_portal2007/in-commerce/elements/forms.tpl is new; release_4_2_0 revision 1.4.2.1 File theme_portal2007/in-commerce/elements/html_head.tpl is new; release_4_2_0 revision 1.2 @@ -275,11 +277,11 @@ File theme_portal2007/in-commerce/elements/order_preview.tpl is new; release_4_2_0 revision 1.7.2.1 File theme_portal2007/in-commerce/elements/registration_fields.tpl is new; release_4_2_0 revision 1.4 File theme_portal2007/in-commerce/elements/sorting.tpl is new; release_4_2_0 revision 1.8.2.2 -File theme_portal2007/in-commerce/elements/content_boxes/featured_products.tpl is new; release_4_2_0 revision 1.5 -File theme_portal2007/in-commerce/elements/content_boxes/home_page_items.tpl is new; release_4_2_0 revision 1.1.2.2 -File theme_portal2007/in-commerce/elements/content_boxes/my_favorites.tpl is new; release_4_2_0 revision 1.1.2.1 -File theme_portal2007/in-commerce/elements/content_boxes/new_products.tpl is new; release_4_2_0 revision 1.4 -File theme_portal2007/in-commerce/elements/content_boxes/pick_products.tpl is new; release_4_2_0 revision 1.4 +File theme_portal2007/in-commerce/elements/content_boxes/featured_products.tpl is new; release_4_2_0 revision 1.5.2.1 +File theme_portal2007/in-commerce/elements/content_boxes/home_page_items.tpl is new; release_4_2_0 revision 1.1.2.3 +File theme_portal2007/in-commerce/elements/content_boxes/my_favorites.tpl is new; release_4_2_0 revision 1.1.2.2 +File theme_portal2007/in-commerce/elements/content_boxes/new_products.tpl is new; release_4_2_0 revision 1.4.2.1 +File theme_portal2007/in-commerce/elements/content_boxes/pick_products.tpl is new; release_4_2_0 revision 1.4.2.1 File theme_portal2007/in-commerce/elements/content_boxes/related_products.tpl is new; release_4_2_0 revision 1.3.2.1 File theme_portal2007/in-commerce/elements/content_boxes/search_results.tpl is new; release_4_2_0 revision 1.5 File theme_portal2007/in-commerce/elements/content_boxes/checkout/billing_address.tpl is new; release_4_2_0 revision 1.1 @@ -335,10 +337,10 @@ File theme_portal2007/in-commerce/my_account/affiliate/affiliate_thankyou.tpl is new; release_4_2_0 revision 1.1 File theme_portal2007/in-commerce/product/details.tpl is new; release_4_2_0 revision 1.19 File theme_portal2007/in-commerce/product/readme.1st is new; release_4_2_0 revision 1.1 -File theme_portal2007/in-commerce/products/add_review.tpl is new; release_4_2_0 revision 1.4.2.3 +File theme_portal2007/in-commerce/products/add_review.tpl is new; release_4_2_0 revision 1.4.2.4 File theme_portal2007/in-commerce/products/add_review_confirm.tpl is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/in-commerce/products/add_review_pending_confirm.tpl is new; release_4_2_0 revision 1.1.2.1 -File theme_portal2007/in-commerce/products/featured_products.tpl is new; release_4_2_0 revision 1.8.2.1 +File theme_portal2007/in-commerce/products/featured_products.tpl is new; release_4_2_0 revision 1.8.2.2 File theme_portal2007/in-commerce/products/form_options.tpl is new; release_4_2_0 revision 1.4.2.2 File theme_portal2007/in-commerce/products/manufacturer_products.tpl is new; release_4_2_0 revision 1.5.2.1 File theme_portal2007/in-commerce/products/new_products.tpl is new; release_4_2_0 revision 1.4.2.1 @@ -415,16 +417,16 @@ File theme_portal2007/inbulletin/topics/new_topic.tpl is new; release_4_2_0 revision 1.5.2.2 File theme_portal2007/inbulletin/topics/new_topic_reply.tpl is new; release_4_2_0 revision 1.6.2.1 File theme_portal2007/inbulletin/topics/search_results.tpl is new; release_4_2_0 revision 1.2 -File theme_portal2007/inlink/detail.tpl is new; release_4_2_0 revision 1.25.2.5 -File theme_portal2007/inlink/index.tpl is new; release_4_2_0 revision 1.19.2.3 +File theme_portal2007/inlink/detail.tpl is new; release_4_2_0 revision 1.25.2.7 +File theme_portal2007/inlink/index.tpl is new; release_4_2_0 revision 1.19.2.4 File theme_portal2007/inlink/module_info.xml is new; release_4_2_0 revision 1.1 File theme_portal2007/inlink/designs/enhancements.tpl is new; release_4_2_0 revision 1.1.2.2 File theme_portal2007/inlink/designs/links.tpl is new; release_4_2_0 revision 1.34.2.3 -File theme_portal2007/inlink/elements/html_head.tpl is new; release_4_2_0 revision 1.2.2.1 +File theme_portal2007/inlink/elements/html_head.tpl is new; release_4_2_0 revision 1.2.2.2 File theme_portal2007/inlink/elements/menu.xml.tpl is new; release_4_2_0 revision 1.1 File theme_portal2007/inlink/elements/sorting.tpl is new; release_4_2_0 revision 1.3.2.2 -File theme_portal2007/inlink/elements/content_boxes/home_page_items.tpl is new; release_4_2_0 revision 1.1.2.2 -File theme_portal2007/inlink/elements/content_boxes/my_favorites.tpl is new; release_4_2_0 revision 1.6.2.1 +File theme_portal2007/inlink/elements/content_boxes/home_page_items.tpl is new; release_4_2_0 revision 1.1.2.3 +File theme_portal2007/inlink/elements/content_boxes/my_favorites.tpl is new; release_4_2_0 revision 1.6.2.2 File theme_portal2007/inlink/elements/content_boxes/search_results.tpl is new; release_4_2_0 revision 1.4 File theme_portal2007/inlink/elements/side_boxes/action_box.tpl is new; release_4_2_0 revision 1.10.2.1 File theme_portal2007/inlink/elements/side_boxes/hot.tpl is new; release_4_2_0 revision 1.2 @@ -436,17 +438,17 @@ File theme_portal2007/inlink/inc/googlemaps.js is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/inlink/inc/script.js is new; release_4_2_0 revision 1.1 File theme_portal2007/inlink/inc/styles.css is new; release_4_2_0 revision 1.3 -File theme_portal2007/inlink/links/add_review.tpl is new; release_4_2_0 revision 1.10.2.1 +File theme_portal2007/inlink/links/add_review.tpl is new; release_4_2_0 revision 1.10.2.2 File theme_portal2007/inlink/links/add_review_confirm.tpl is new; release_4_2_0 revision 1.3 File theme_portal2007/inlink/links/add_review_pending_confirm.tpl is new; release_4_2_0 revision 1.3 -File theme_portal2007/inlink/links/hot_links.tpl is new; release_4_2_0 revision 1.7.2.1 +File theme_portal2007/inlink/links/hot_links.tpl is new; release_4_2_0 revision 1.7.2.2 File theme_portal2007/inlink/links/modify_confirm.tpl is new; release_4_2_0 revision 1.6 File theme_portal2007/inlink/links/modify_link.tpl is new; release_4_2_0 revision 1.14.2.3 File theme_portal2007/inlink/links/modify_pending_confirm.tpl is new; release_4_2_0 revision 1.5 -File theme_portal2007/inlink/links/new_links.tpl is new; release_4_2_0 revision 1.8.2.1 -File theme_portal2007/inlink/links/pick_links.tpl is new; release_4_2_0 revision 1.7.2.1 -File theme_portal2007/inlink/links/pop_links.tpl is new; release_4_2_0 revision 1.7.2.1 -File theme_portal2007/inlink/links/search_results.tpl is new; release_4_2_0 revision 1.3.2.1 +File theme_portal2007/inlink/links/new_links.tpl is new; release_4_2_0 revision 1.8.2.2 +File theme_portal2007/inlink/links/pick_links.tpl is new; release_4_2_0 revision 1.7.2.2 +File theme_portal2007/inlink/links/pop_links.tpl is new; release_4_2_0 revision 1.7.2.2 +File theme_portal2007/inlink/links/search_results.tpl is new; release_4_2_0 revision 1.3.2.2 File theme_portal2007/inlink/links/suggest_confirm.tpl is new; release_4_2_0 revision 1.6 File theme_portal2007/inlink/links/suggest_link.tpl is new; release_4_2_0 revision 1.12.2.2 File theme_portal2007/inlink/links/suggest_pending_confirm.tpl is new; release_4_2_0 revision 1.6 @@ -459,31 +461,31 @@ File theme_portal2007/inlink/links/enhancements/extend_enhancement_confirm.tpl is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/inlink/my_account/my_items.tpl is new; release_4_2_0 revision 1.2.2.1 File theme_portal2007/inlink/my_account/my_links.tpl is new; release_4_2_0 revision 1.9.2.2 -File theme_portal2007/innews/detail.tpl is new; release_4_2_0 revision 1.17.2.4 -File theme_portal2007/innews/index.tpl is new; release_4_2_0 revision 1.21.2.2 +File theme_portal2007/innews/detail.tpl is new; release_4_2_0 revision 1.17.2.5 +File theme_portal2007/innews/index.tpl is new; release_4_2_0 revision 1.21.2.3 File theme_portal2007/innews/module_info.xml is new; release_4_2_0 revision 1.1 -File theme_portal2007/innews/articles/add_review.tpl is new; release_4_2_0 revision 1.8.2.1 +File theme_portal2007/innews/articles/add_review.tpl is new; release_4_2_0 revision 1.8.2.2 File theme_portal2007/innews/articles/add_review_confirm.tpl is new; release_4_2_0 revision 1.3 File theme_portal2007/innews/articles/add_review_pending_confirm.tpl is new; release_4_2_0 revision 1.3 File theme_portal2007/innews/articles/hot_articles.tpl is new; release_4_2_0 revision 1.6.2.1 File theme_portal2007/innews/articles/modify_article.tpl is new; release_4_2_0 revision 1.11.2.1 File theme_portal2007/innews/articles/modify_confirm.tpl is new; release_4_2_0 revision 1.5.2.1 File theme_portal2007/innews/articles/modify_pending_confirm.tpl is new; release_4_2_0 revision 1.5.2.1 -File theme_portal2007/innews/articles/new_articles.tpl is new; release_4_2_0 revision 1.6.2.1 -File theme_portal2007/innews/articles/pick_articles.tpl is new; release_4_2_0 revision 1.6.2.1 -File theme_portal2007/innews/articles/pop_articles.tpl is new; release_4_2_0 revision 1.6.2.1 -File theme_portal2007/innews/articles/search_results.tpl is new; release_4_2_0 revision 1.3.2.1 +File theme_portal2007/innews/articles/new_articles.tpl is new; release_4_2_0 revision 1.6.2.2 +File theme_portal2007/innews/articles/pick_articles.tpl is new; release_4_2_0 revision 1.6.2.2 +File theme_portal2007/innews/articles/pop_articles.tpl is new; release_4_2_0 revision 1.6.2.2 +File theme_portal2007/innews/articles/search_results.tpl is new; release_4_2_0 revision 1.3.2.2 File theme_portal2007/innews/articles/suggest_article.tpl is new; release_4_2_0 revision 1.9.2.1 File theme_portal2007/innews/articles/suggest_confirm.tpl is new; release_4_2_0 revision 1.5.2.1 File theme_portal2007/innews/articles/suggest_pending_confirm.tpl is new; release_4_2_0 revision 1.5.2.1 -File theme_portal2007/innews/designs/articles.tpl is new; release_4_2_0 revision 1.26.2.3 +File theme_portal2007/innews/designs/articles.tpl is new; release_4_2_0 revision 1.26.2.4 File theme_portal2007/innews/elements/html_head.tpl is new; release_4_2_0 revision 1.2 File theme_portal2007/innews/elements/menu.xml.tpl is new; release_4_2_0 revision 1.1 File theme_portal2007/innews/elements/sorting.tpl is new; release_4_2_0 revision 1.3.2.2 File theme_portal2007/innews/elements/content_boxes/home_page_items.tpl is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/innews/elements/content_boxes/my_favorites.tpl is new; release_4_2_0 revision 1.7 File theme_portal2007/innews/elements/content_boxes/search_results.tpl is new; release_4_2_0 revision 1.5 -File theme_portal2007/innews/elements/content_boxes/site_lead_article.tpl is new; release_4_2_0 revision 1.3.2.1 +File theme_portal2007/innews/elements/content_boxes/site_lead_article.tpl is new; release_4_2_0 revision 1.3.2.2 File theme_portal2007/innews/elements/side_boxes/action_box.tpl is new; release_4_2_0 revision 1.6.2.1 File theme_portal2007/innews/elements/side_boxes/hot.tpl is new; release_4_2_0 revision 1.3 File theme_portal2007/innews/elements/side_boxes/new.tpl is new; release_4_2_0 revision 1.3 @@ -501,8 +503,8 @@ File theme_portal2007/platform/categories/suggest_category.tpl is new; release_4_2_0 revision 1.8 File theme_portal2007/platform/categories/suggest_confirm.tpl is new; release_4_2_0 revision 1.3 File theme_portal2007/platform/categories/suggest_pending_confirm.tpl is new; release_4_2_0 revision 1.3 -File theme_portal2007/platform/designs/categories.tpl is new; release_4_2_0 revision 1.6.2.1 -File theme_portal2007/platform/designs/content_boxes.tpl is new; release_4_2_0 revision 1.16.2.2 +File theme_portal2007/platform/designs/categories.tpl is new; release_4_2_0 revision 1.6.2.2 +File theme_portal2007/platform/designs/content_boxes.tpl is new; release_4_2_0 revision 1.16.2.3 File theme_portal2007/platform/designs/default_design.tpl is new; release_4_2_0 revision 1.15.2.2 File theme_portal2007/platform/designs/popup_design.tpl is new; release_4_2_0 revision 1.1 File theme_portal2007/platform/designs/preferences.tpl is new; release_4_2_0 revision 1.5 @@ -519,7 +521,7 @@ File theme_portal2007/platform/elements/subcats.xml.tpl is new; release_4_2_0 revision 1.2 File theme_portal2007/platform/elements/content_boxes/no_favorites.tpl is new; release_4_2_0 revision 1.1 File theme_portal2007/platform/elements/content_boxes/nothing_found.tpl is new; release_4_2_0 revision 1.2 -File theme_portal2007/platform/elements/content_boxes/sub_categories.tpl is new; release_4_2_0 revision 1.3.2.2 +File theme_portal2007/platform/elements/content_boxes/sub_categories.tpl is new; release_4_2_0 revision 1.3.2.3 File theme_portal2007/platform/elements/side_boxes/login.tpl is new; release_4_2_0 revision 1.11.2.4 File theme_portal2007/platform/elements/side_boxes/mailing_list.tpl is new; release_4_2_0 revision 1.2 File theme_portal2007/platform/elements/side_boxes/recommend_site.tpl is new; release_4_2_0 revision 1.2 @@ -607,15 +609,16 @@ File theme_portal2007/platform/inc/nlsmenuext_dyn.js is new; release_4_2_0 revision 1.1 File theme_portal2007/platform/inc/nlsmenuext_xml.js is new; release_4_2_0 revision 1.5 File theme_portal2007/platform/inc/script.js is new; release_4_2_0 revision 1.4.2.4 -File theme_portal2007/platform/inc/styles.css is new; release_4_2_0 revision 1.26.2.4 +File theme_portal2007/platform/inc/styles.css is new; release_4_2_0 revision 1.26.2.6 File theme_portal2007/platform/inc/lbox/effects.js is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/platform/inc/lbox/lightbox.css is new; release_4_2_0 revision 1.1.2.2 File theme_portal2007/platform/inc/lbox/lightbox.js is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/platform/inc/lbox/prototype.js is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/platform/inc/lbox/scriptaculous.js is new; release_4_2_0 revision 1.1.2.1 -File theme_portal2007/platform/login/forgot_password.tpl is new; release_4_2_0 revision 1.1.2.1 +File theme_portal2007/platform/login/forgot_password.tpl is new; release_4_2_0 revision 1.1.2.2 File theme_portal2007/platform/login/forgot_password_reset.tpl is new; release_4_2_0 revision 1.1.2.2 File theme_portal2007/platform/login/forgot_password_reset_confirm.tpl is new; release_4_2_0 revision 1.1.2.1 +File theme_portal2007/platform/login/forgot_password_reset_notice.tpl is new; release_4_2_0 revision 1.1.2.1 File theme_portal2007/platform/login/register.tpl is new; release_4_2_0 revision 1.8.2.2 File theme_portal2007/platform/login/register_confirm.tpl is new; release_4_2_0 revision 1.3 File theme_portal2007/platform/login/register_confirm_pending.tpl is new; release_4_2_0 revision 1.3.2.2