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

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. … 73 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
  1. … 7 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
  1. … 7 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-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".

  1. … 10 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-1204 - Association between e-mail log e-mails and corresponding items from Catalog

  1. … 3 more files in changeset.

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

  1. … 16 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. … 25 more files in changeset.

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

  1. … 2 more files in changeset.

Bug INP-1203: OOP unit config creation

  1. … 40 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

  1. … 1 more file in changeset.

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

  1. … 53 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

  1. … 35 more files in changeset.

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

  1. … 364 more files in changeset.