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

Merge of "modules/in-link/branches/5.2.x@16517" to "modules/in-link/branches/5.3.x@16507".

Conflicts:

  • units/link_validation/link_validation_eh.php
  • units/links/links_event_handler.php
    • -1
    • +1
    ./listing_types/listing_types_event_handler.php
    • -11
    • +11
    ./listings/listings_event_handler.php
    • -8
    • +8
    ./link_validation/link_validation_eh.php
    • -2
    • +2
    ./listing_types/listing_types_tag_processor.php
  1. … 2 more files in changeset.

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
    • -10
    • +3
    ./link_validation/link_validation_eh.php
  1. … 4 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
    • -12
    • +13
    ./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-1511 - Presets for category items export

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

  1. … 1 more file 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.

Merge of "modules/in-link/branches/5.2.x@16146" to "modules/in-link/branches/5.3.x@16186".

    • -1
    • +1
    ./link_validation/link_validation_config.php
  1. … 1 more file in changeset.

Bug INP-1079 - Routing Ideas

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

    • -0
    • +40
    ./links/LinkRouter.php
    • -0
    • +30
    ./links/LinkReviewRouter.php
  1. … 1 more file in changeset.

Merge of "modules/in-link/releases/5.2.1@16070" to "modules/in-link/branches/5.3.x@15992".

    • -1
    • +1
    ./link_validation/link_validation_eh.php
  1. … 6 more files in changeset.

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

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

    • -50
    • +52
    ./listings/listings_event_handler.php

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

    • -1
    • +1
    ./link_validation/link_validation_eh.php
  1. … 2 more files in changeset.

Merge of "modules/in-link/releases/5.2.1-B2@15766" to "modules/in-link/branches/5.3.x@15808".

Merge of "modules/in-link/releases/5.2.1-RC1@15882" to "modules/in-link/branches/5.3.x@15808".

  1. … 6 more files in changeset.

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

    • -2
    • +2
    ./link_validation/link_validation_eh.php

Bug INP-1203: OOP unit config creation

    • -36
    • +50
    ./link_validation/link_validation_eh.php
    • -53
    • +83
    ./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
    • +1
    ./link_validation/link_validation_eh.php
    • -18
    • +18
    ./listings/listings_event_handler.php
  1. … 12 more files in changeset.

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -142
    • +142
    ./listings/listings_config.php
    • -130
    • +135
    ./listing_types/listing_types_config.php
    • -127
    • +127
    ./link_validation/link_validation_config.php

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

    • -0
    • +60
    ./link_validation/link_validation_tp.php
    • -0
    • +171
    ./link_validation/link_validation_config.php
    • -0
    • +571
    ./link_validation/link_validation_eh.php
    • -0
    • +49
    ./listing_types/listing_types_tag_processor.php
    • -0
    • +97
    ./listing_types/listing_types_event_handler.php
    • -0
    • +162
    ./listing_types/listing_types_config.php
    • -0
    • +846
    ./listings/listings_event_handler.php
    • -0
    • +90
    ./listings/listings_tag_processor.php
  1. … 89 more files in changeset.