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

Merge of "modules/in-link/branches/5.2.x@16486" to "modules/in-link/branches/5.3.x@16431".

Merge of "modules/in-link/releases/5.2.2-B1@16499" to "modules/in-link/branches/5.3.x@16431".

Conflicts:

  • install/upgrades.php
  • install/upgrades.sql
  1. … 5 more files in changeset.

Merge of "modules/in-link/branches/5.2.x@16386" to "modules/in-link/branches/5.3.x@16393".

Conflicts:

  • units/link_validation/link_validation_config.php
  • units/links/links_config.php
  • units/listings/listings_event_handler.php
  1. … 1 more file in changeset.

Merge of "modules/in-link/releases/5.2.1-B1@15628" to "modules/in-link/branches/5.3.x@15657".

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

Bug INP-1314 - Change module-dependency to unit-dependency

  1. … 1 more file in changeset.

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

  1. … 1 more file in changeset.

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

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

Merge of "modules/in-link/releases/5.2.1-B1@15628" to "modules/in-link/branches/5.3.x@15657".

  1. … 15 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

  1. … 4 more files in changeset.

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

  1. … 100 more files in changeset.