Source Changes

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/attributeManager/classes/attributeManagerConfig.class.php

Tweak: Attribute Manager Attribute sort order - revert change from 1647. Attribute values require a sort order.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/orders.php
    Delete    /branches/dev/2.1/catalog/admin/paypal_ipn.php
    Delete    /branches/dev/2.1/catalog/admin/paypal_ipn_order.php

Bug Fix #1030 http://bugtrack.oscmax.com/view.php?id=1030 Removed files and code - deprecated remnants from long removed Paypal Shopping Cart IPN module.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/order_editor/cart.php

Removed products_ship_price from products query - field no longer present in database.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/includes/modules/order_total/ot_coupon.php

Bug Fix #977 http://bugtrack.oscmax.com/view.php?id=977 Discount coupons causing incorrect tax/total

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/includes/languages/german/categories.php
    Modify    /branches/dev/2.1/catalog/admin/includes/languages/german/configuration.php
    Modify    /branches/dev/2.1/catalog/includes/languages/german/indvship.php
    Modify    /branches/dev/2.1/catalog/includes/languages/german/product_info.php
    Modify    /branches/dev/2.1/catalog/includes/languages/german/usps.php
    Modify    /branches/dev/2.1/catalog/install/includes/languages/deutsch/core.php

Bug Fix #1107 http://bugtrack.oscmax.com/view.php?id=1107 German language updates

Changed Paths:
    Modify    /branches/dev/2.1/catalog/includes/classes/shipping.php

Reverting r1641 changes for /includes/classes/shipping.php to restore normal checkout function while individual shipping module is re-worked.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/includes/modules/analytics.php

Bug Fix #831 Part 2 - update to analytics.php module. http://bugtrack.oscmax.com/view.php?id=831

Changed Paths:
    Delete    /branches/dev/2.1/catalog/affiliate_affiliateOrg.php
    Modify    /branches/dev/2.1/catalog/includes/application_top.php
    Modify    /branches/dev/2.1/catalog/includes/boxes/categories.php
    Modify    /branches/dev/2.1/catalog/includes/boxes/loginbox.php
    Modify    /branches/dev/2.1/catalog/includes/boxes/mailchimp_newsletters.php
    Modify    /branches/dev/2.1/catalog/includes/boxes/search.php
    Modify    /branches/dev/2.1/catalog/includes/column_left.php
    Modify    /branches/dev/2.1/catalog/includes/column_right.php
    Delete    /branches/dev/2.1/catalog/templates/fallback/articles_page.tpl.php
    Modify    /branches/dev/2.1/catalog/templates/fallback/content/article_info.tpl.php

Bug Fix: #997 - BOX_WIDTH removal - changed to use width of column being displayed in Also removed two orphan files which do not appear to be part of osCmax: - catalog/affiliate_affiliateOrg.php - catalog/templates/fallback/articles_page.tpl.php

Changed Paths:
    Modify    /branches/dev/2.1/catalog/templates/fallback/main_page.tpl.php

Bug Fix: Missing ?> from commit r1653 in main_page.tpl.php

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/includes/general.js

Bug Fix: #1106 - Small fix to form focus in the admin panel when editing configuration.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/includes/languages/german/categories.php
    Modify    /branches/dev/2.1/catalog/admin/includes/languages/german/configuration.php
    Modify    /branches/dev/2.1/catalog/admin/includes/languages/german/core.php
    Modify    /branches/dev/2.1/catalog/includes/languages/german/quantumqgwdbe.php

Bug Fix #1092 German Language updates http://bugtrack.oscmax.com/view.php?id=1092

Changed Paths:
    Add    /branches/dev/2.1/catalog/admin/includes/modules/batch_print/.htaccess

Bug Fix #451 http://bugtrack.oscmax.com/view.php?id=451 Batch Print pdf expires set properly.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/includes/modules/slideshow.php

Bug fix #689 http://bugtrack.oscmax.com/view.php?id=689

Changed Paths:
    Modify    /branches/dev/2.1/catalog/templates/fallback-html/main_page.code.php

Bug Fix #535 http://bugtrack.oscmax.com/view.php?id=535

Changed Paths:
    Modify    /branches/dev/2.1/catalog/install/oscmax.sql

Bug fix #1097 http://bugtrack.oscmax.com/view.php?id=1097 Paypal WPP admin access added to installer script

Changed Paths:
    Modify    /branches/dev/2.1/catalog/templates/compromise/main_page.code.php
    Modify    /branches/dev/2.1/catalog/templates/compromise/main_page.html
    Modify    /branches/dev/2.1/catalog/templates/fallback-html/main_page.code.php
    Modify    /branches/dev/2.1/catalog/templates/fallback-html/main_page.html
    Modify    /branches/dev/2.1/catalog/templates/fallback/main_page.tpl.php

Bug Fix #831 http://bugtrack.oscmax.com/view.php?id=831 Update Google Analytics to use asynchronous javascript code in all templates.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/stats_low_stock_attrib.php

Bug fix #1067 http://bugtrack.oscmax.com/view.php?id=1067 HTML format adjustment for admin/stats_low_stock_attrib.php

Changed Paths:
    Add    /branches/dev/2.1/catalog/cache/.htaccess

Bug fix #975 http://bugtrack.oscmax.com/view.php?id=975 Added .htaccess file protection to the cache directory.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/includes/languages/english/usps.php
    Modify    /branches/dev/2.1/catalog/includes/modules/shipping/usps.php

Updated USPS shipping module to v5.2.2 Bug Fix #1079 http://bugtrack.oscmax.com/view.php?id=1079 USPS shipping module not displaying First Class International Parcel rates or First Class Parcel rates.

Changed Paths:
    Modify    /branches/dev/2.1/catalog/admin/whos_online.php

Bug Fix #881 Incorrect geolocation API url causing whos_online.php to time out.