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

Merge of "modules/in-link/branches/5.2.x@16542" to "modules/in-link/branches/5.3.x@16523".

Conflicts:

  • install/install_data.sql
  • install/upgrades.sql

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
    • -15
    • +15
    ./units/links/link_tag_processor.php
    • -15
    • +15
    ./units/links/links_event_handler.php

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

Merge of "modules/in-link/branches/5.2.x@16412" to "modules/in-link/branches/5.3.x@16399".

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

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-1554 - Allow searching category items by meta fields

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

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-1459 - Remove "Intechnic\" from namespace

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

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

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
    • +40
    ./units/links/LinkRouter.php
    • -0
    • +16
    ./install/cache/class_structure.php
    • -0
    • +30
    ./units/links/LinkReviewRouter.php

Bug INP-1429 - Class hierarchy analyzer

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

    • -1
    • +87
    ./install/cache/class_structure.php

Bug INP-1422 - Store class map on disk

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

    • -0
    • +23
    ./install/cache/class_structure.php
    • -0
    • +1
    ./install/cache/.gitignore

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

    • -2
    • +2
    ./admin_templates/duplicate_checker.tpl

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

    • -1
    • +1
    ./admin_templates/links/links_categories.tpl

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

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

    • -1
    • +1
    ./admin_templates/links/links_categories.tpl

Bug INP-1274 - Move deployment script log to database

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

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

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

Bug INP-1203: OOP unit config creation

    • -29
    • +38
    ./units/links/links_event_handler.php
    • -18
    • +22
    ./units/links/link_tag_processor.php

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

Commit on behalf of Erik

    • -1
    • +1
    ./admin_templates/links/links_edit.tpl

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

    • -0
    • +2
    ./admin_templates/links/review_edit.tpl
    • -3
    • +5
    ./admin_templates/links/images_edit.tpl
    • -1
    • +1
    ./admin_templates/links/links_edit.tpl
    • -1
    • +3
    ./admin_templates/links/relations_edit.tpl
    • binary
    ./admin_templates/img/toolbar/toolbar-sprite.png

Bug #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -60
    • +62
    ./units/l-visits/l-visits_config.php
    • -142
    • +142
    ./units/listings/listings_config.php
    • -562
    • +563
    ./units/links/links_config.php

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

    • -0
    • +14
    ./admin_templates/export_progress.tpl
    • -0
    • +73
    ./admin_templates/duplicate_checker.tpl
  1. … 89 more files in changeset.