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

Merge of "w/in-commerce/branches/5.2.x@16541" to "w/in-commerce/branches/5.3.x@16522".

Conflicts:

  • install/install_data.sql
  • install/upgrades.sql
    • -3
    • +2
    ./shipping_quote_engines/shipping_quote_collector.php
  1. … 2 more files in changeset.

Merge of "w/in-commerce/branches/5.2.x@16516" to "w/in-commerce/branches/5.3.x@16506".

Conflicts:

  • units/coupons/coupons_event_handler.php
    • -1
    • +1
    ./payment_type_currencies/payment_type_currencies_event_handler.php
    • -1
    • +1
    ./affiliate_plans_items/affiliate_plans_items_tag_processor.php
    • -4
    • +4
    ./manufacturers/manufacturers_event_handler.php
    • -8
    • +8
    ./taxesdestinations/taxes_dst_event_handler.php
    • -1
    • +1
    ./gateways/gw_classes/rightconnect.php
    • -1
    • +1
    ./coupon_items/coupon_items_tag_processor.php
    • -4
    • +4
    ./affiliates/affiliates_tag_processor.php
  1. … 63 more files in changeset.

Merge of "w/in-commerce/branches/5.2.x@16489" to "w/in-commerce/branches/5.3.x@16430".

Merge of "w/in-commerce/releases/5.2.2-B1@16493" to "w/in-commerce/branches/5.3.x@16430".

Conflicts:

  • install/upgrades.php
  • install/upgrades.sql
  • units/affiliates/affiliates_event_handler.php
    • -18
    • +1
    ./shipping_quote_engines/shipping_quote_engine_event_handler.php
    • -10
    • +33
    ./orders/orders_event_handler.php
    • -6
    • +0
    ./affiliates/affiliates_event_handler.php
  1. … 4 more files in changeset.

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
    • -34
    • +73
    ./orders/orders_tag_processor.php
    • -0
    • +2
    ./order_items/order_items_tag_processor.php
    • -8
    • +12
    ./products/products_event_handler.php
    • -70
    • +130
    ./orders/orders_event_handler.php
  1. … 2 more files in changeset.

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

1. restored changes, that were lost during inaccurate merge conflict resolution

Bug INP-1511 - Presets for category items export

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

  1. … 2 more files in changeset.

Bug INP-1481 - Add missing "svn:keywords" properties to PHP files (5.3.x)

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

  1. … 1 more file in changeset.

Bug INP-1436 - PHP 7 compatibility issues

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

    • -2
    • +2
    ./gateways/gw_classes/google_checkout.php

Bug INP-1462 - Simplify "kEvent" class constructor

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

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

    • -24
    • +42
    ./affiliates/affiliates_tag_processor.php
    • -24
    • +49
    ./orders/orders_event_handler.php
  1. … 3 more files in changeset.

Bug INP-1079 - Routing Ideas

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

    • -0
    • +40
    ./products/ProductRouter.php
    • -0
    • +30
    ./products/ProductReviewRouter.php
  1. … 1 more file 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".

    • -7
    • +10
    ./product_option_combinations/product_option_combinations_event_handler.php
    • -3
    • +4
    ./affiliates/affiliates_event_handler.php
    • -2
    • +3
    ./shipping_costs/shipping_costs_event_handler.php
    • -2
    • +3
    ./product_options/product_options_tag_processor.php
    • -3
    • +1
    ./affiliates/affiliates_tag_processor.php
    • -1
    • +8
    ./taxesdestinations/taxes_dst_event_handler.php
    • -2
    • +2
    ./order_items/order_items_event_handler.php
  1. … 10 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. … 23 more files in changeset.

Bug INP-1204 - Association between e-mail log e-mails and corresponding items from Catalog

    • -12
    • +19
    ./affiliates/affiliates_event_handler.php
    • -2
    • +2
    ./gift_certificates/gift_certificates_eh.php

Bug INP-1302 - Use build-in date manipulation functions instead of adodb library

    • -1
    • +1
    ./gateways/gw_classes/google_checkout.php
    • -9
    • +9
    ./affiliates/affiliates_event_handler.php
    • -2
    • +2
    ./currencies/currencies_event_handler.php
  1. … 4 more files in changeset.

Bug INP-1301 - Cloned Unit Config not available during url processing

    • -1
    • +1
    ./addresses/addresses_event_handler.php

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".

    • -0
    • +2
    ./product_option_combinations/product_option_combinations_event_handler.php
    • -5
    • +5
    ./gateways/gw_classes/google_checkout.php
    • -0
    • +1
    ./order_items/order_items_event_handler.php
    • -0
    • +1
    ./shipping_costs/shipping_costs_event_handler.php
    • -17
    • +17
    ./shipping_quote_engines/intershipper.php
    • -5
    • +5
    ./product_options/product_options_tag_processor.php
    • -2
    • +7
    ./order_items/order_items_tag_processor.php
  1. … 11 more files in changeset.

Bug INP-1280 - Ensure presence of 'parent_event' parameter in majority kTempTablesHandler usages

Bug INP-1203: OOP unit config creation

    • -2
    • +3
    ./affiliate_plans_items/affiliate_plans_items_tag_processor.php
    • -6
    • +6
    ./product_option_combinations/product_option_combinations_event_handler.php
    • -23
    • +31
    ./discount_items/discount_items_event_handler.php
    • -29
    • +33
    ./products/products_event_handler.php
    • -17
    • +21
    ./affiliates/affiliates_event_handler.php
    • -175
    • +150
    ./reports/reports_event_handler.php
    • -23
    • +23
    ./addresses/addresses_event_handler.php
    • -2
    • +3
    ./discount_items/discount_items_tag_processor.php
    • -2
    • +1
    ./gateways/gw_classes/paypal_direct.php
    • -11
    • +11
    ./products/products_tag_processor.php
  1. … 30 more files in changeset.

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

1. changes to unit configs were merged incorrectly

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

    • -20
    • +22
    ./products/products_event_handler.php
    • -13
    • +13
    ./affiliates/affiliates_event_handler.php
    • -1
    • +1
    ./manufacturers/manufacturers_config.php
    • -9
    • +23
    ./shipping/shipping_tag_processor.php
    • -1
    • +1
    ./gateways/gw_classes/paypal_direct.php
  1. … 41 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -113
    • +112
    ./pricing/pricing_config.php
    • -132
    • +135
    ./addresses/addresses_config.php
    • -111
    • +112
    ./manufacturers/manufacturers_config.php
    • -106
    • +105
    ./reports/reports_config.php
    • -177
    • +182
    ./shipping/shipping_config.php
    • -32
    • +34
    ./gateway_field_values/gateway_field_values_config.php
    • -104
    • +105
    ./discount_items/discount_items_config.php
    • -44
    • +44
    ./affiliate_plans_brackets/affiliate_plans_brackets_config.php
    • -625
    • +640
    ./products/products_config.php
    • -203
    • +203
    ./affiliates/affiliates_config.php
    • -55
    • +57
    ./taxesdestinations/taxesdestinations_config.php
    • -122
    • +128
    ./product_option_combinations/product_option_combinations_config.php
    • -45
    • +48
    ./payment_type_currencies/payment_type_currencies_config.php
  1. … 21 more files in changeset.

Bug #0001023: Ability to Keep Language Packs in Sync

INP-825

    • -22
    • +0
    ./currencies/currencies_event_handler.php

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

    • -0
    • +105
    ./affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php
    • -0
    • +65
    ./affiliate_plans_brackets/affiliate_plans_brackets_config.php
    • -0
    • +123
    ./affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
    • -0
    • +174
    ./taxesdestinations/taxes_dst_event_handler.php
    • -0
    • +75
    ./taxesdestinations/taxesdestinations_config.php
    • -0
    • +161
    ./discount_items/discount_items_event_handler.php
  1. … 357 more files in changeset.