Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Merge of "w/in-commerce/branches/5.2.x@16385" to "w/in-commerce/branches/5.3.x@16392".

Conflicts:

  • admin_templates/orders/export/export.tpl
  • units/addresses/addresses_config.php
  • units/affiliate_payments/affiliate_payments_config.php
  • units/affiliates/affiliates_config.php
  • units/coupons/coupons_config.php
  • units/currencies/currencies_config.php
  • units/gateways/gateways_config.php
  • units/manufacturers/manufacturers_config.php
  • units/order_items/order_items_config.php
  • units/orders/orders_config.php
  • units/orders/orders_event_handler.php
  • units/orders/orders_tag_processor.php
  • units/product_option_combinations/product_option_combinations_config.php
  • units/products/products_config.php
  • units/reports/reports_config.php
  1. … 12 more files in changeset.

Bug INP-1511 - Presets for category items export

Differential Revision: http://qa.in-portal.org/D162

  1. … 1 more file in changeset.

Merge of "w/in-commerce/branches/5.2.x@16151" to "w/in-commerce/branches/5.3.x@16185".

  1. … 9 more files in changeset.

Fixes MINC-112 - Remove the SSN field

Differential Revision: http://qa.in-portal.org/D26

  1. … 4 more files in changeset.

Merge of "w/in-commerce/releases/5.2.1@16076" to "w/in-commerce/branches/5.3.x@15991".

  1. … 21 more files in changeset.

Bug INP-1316 - Add primary key to table, that don't have it

Commit on behalf of Erik

  1. … 1 more file in changeset.

Bug INP-1298 - Use "http_build_query" to escape url parameters

    • -1
    • +1
    ./products/products_packagecontent.tpl
    • -1
    • +1
    ./affiliate_plans/affiliate_plans_items.tpl
  1. … 9 more files in changeset.

Merge of "w/in-commerce/releases/5.2.1-B2@15769" to "w/in-commerce/branches/5.3.x@15807".

Merge of "w/in-commerce/releases/5.2.1-RC1@15885" to "w/in-commerce/branches/5.3.x@15807".

    • -1
    • +1
    ./affiliate_plans/affiliate_plans_edit.tpl
  1. … 24 more files in changeset.

Bug INP-1174: Using CodeMirror on SQL Query page in Admin

Commit on behalf of Erik

    • -1
    • +1
    ./manufacturers/manufacturers_edit.tpl

Merge of "w/in-commerce/releases/5.2.1-B1@15631" to "w/in-commerce/branches/5.3.x@15656".

    • -0
    • +2
    ./affiliate_plans/affiliate_plans_edit.tpl
    • -0
    • +2
    ./affiliate_plans/affiliate_plans_brackets.tpl
    • -0
    • +2
    ./paid_listings/paid_listing_type_shopcart.tpl
    • -0
    • +2
    ./affiliate_plans/affiliate_plans_items.tpl
    • -0
    • +2
    ./affiliate_plans/affiliate_payment_types_edit.tpl
    • -1
    • +1
    ./manufacturers/manufacturers_edit.tpl
  1. … 41 more files in changeset.

Releasing version 'branches/5.3.x' (copy from 'branches/5.2.x') of 'w/in-commerce' module.

    • -0
    • +77
    ./affiliate_plans/affiliate_payment_types_list.tpl
    • -0
    • +114
    ./affiliate_plans/affiliate_plans_items.tpl
    • -0
    • +45
    ./affiliate_plans/affiliates_payout.tpl
    • -0
    • +176
    ./affiliate_plans/affiliate_plans_brackets.tpl
    • -0
    • +95
    ./affiliate_plans/affiliate_payment_types_edit.tpl
    • -0
    • +74
    ./affiliate_plans/affiliate_plans_list.tpl
    • -0
    • +66
    ./affiliate_plans/affiliates_list.tpl
    • -0
    • +103
    ./affiliate_plans/affiliate_plans_edit.tpl
    • -0
    • +100
    ./affiliate_plans/affiliates_edit.tpl
  1. … 357 more files in changeset.