Modules.In-Commerce

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
    • -5
    • +3
    /branches/5.3.x/units/helpers/order_helper.php

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
    • -2
    • +2
    /branches/5.3.x/units/orders/order_manager.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
    • -5
    • +23
    /branches/5.3.x/units/helpers/order_helper.php

Merge of "w/in-commerce/branches/5.2.x@16423" to "w/in-commerce/branches/5.3.x@16398".

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
    • -13
    • +23
    /branches/5.3.x/units/orders/orders_config.php
    • -6
    • +13
    /branches/5.3.x/units/orders/orders_item.php

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

    • -2
    • +2
    /branches/5.3.x/units/orders/orders_config.php

Bug INP-1554 - Allow searching category items by meta fields

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

    • -0
    • +2
    /branches/5.3.x/install/install_data.sql

Bug INP-1511 - Presets for category items export

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

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

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

Bug INP-1436 - PHP 7 compatibility issues

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

Bug INP-1462 - Simplify "kEvent" class constructor

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

Bug INP-1459 - Remove "Intechnic\" from namespace

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

    • -1
    • +1
    /branches/5.3.x/install/install_data.sql

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

Bug INP-1421 - Integrate Symfony Console Component

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

Bug INP-1079 - Routing Ideas

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

    • -0
    • +16
    /branches/5.3.x/install/cache/class_structure.php
    • -0
    • +40
    /branches/5.3.x/units/products/ProductRouter.php
    • -0
    • +30
    /branches/5.3.x/units/products/ProductReviewRouter.php

Bug INP-1429 - Class hierarchy analyzer

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

    • -1
    • +736
    /branches/5.3.x/install/cache/class_structure.php

Bug INP-1422 - Store class map on disk

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

    • -0
    • +1
    /branches/5.3.x/install/cache/.gitignore
    • -0
    • +120
    /branches/5.3.x/install/cache/class_structure.php

Fixes MINC-112 - Remove the SSN field

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

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

  1. … 10 more files in changeset.

Bug INP-1290 - Deal with "svn:ignore" attributes

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

Commit on behalf of Erik

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

  1. … 9 more files in changeset.

Bug INP-1274 - Move deployment script log to database

    • -1
    • +1
    /branches/5.3.x/install/install_data.sql

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

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

  1. … 4 more files in changeset.

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

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

    • -6
    • +6
    /branches/5.3.x/units/orders/orders_item.php
  1. … 30 more files in changeset.

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

Commit on behalf of Erik