branches

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

[backported] Bug INP-1690 - Remove "Intechnic\" from namespace

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
    ./5.3.x/units/links/link_tag_processor.php
    • -11
    • +11
    ./5.3.x/units/listings/listings_event_handler.php
    • -15
    • +15
    ./5.3.x/units/links/links_event_handler.php

Bug INP-1577 - CS fix all variable type comment

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

    • -11
    • +11
    ./5.2.x/units/listings/listings_event_handler.php
    • -14
    • +14
    ./5.2.x/units/links/links_event_handler.php
    • -15
    • +15
    ./5.2.x/units/links/link_tag_processor.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

Bug INP-1552 - Import language pack without overwrite on separate module install

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

Bug INP-1486 - Don't give up, when single item update fails in "iterateItems" method

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

Bug: INP-921 - Prepare 5.2.x releases

1. preparing In-Link 5.2.2-B1 release

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

[backported] Bug INP-1616 - Change module-dependency to unit-dependency

    • -1
    • +1
    ./5.2.x/units/links/link_tag_processor.php

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
    ./5.3.x/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

    • -2
    • +2
    ./5.3.x/units/listings/listings_config.php

Bug INP-1579 - Remove "ItemSQLs" from unit configs

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

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

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

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

Bug INP-1511 - Presets for category items export

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

    • -0
    • +12
    ./5.3.x/units/links/links_config.php

Fixes MINL-18 - Link isn't added/removed to category specified in Listing Type

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

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

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

    • -0
    • +0
    ./5.3.x/units/links/LinkReviewRouter.php
    • -0
    • +0
    ./5.3.x/install/cache/class_structure.php

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

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

Bug INP-1079 - Routing Ideas

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

    • -0
    • +40
    ./5.3.x/units/links/LinkRouter.php
    • -0
    • +16
    ./5.3.x/install/cache/class_structure.php
    • -0
    • +30
    ./5.3.x/units/links/LinkReviewRouter.php

Bug INP-1429 - Class hierarchy analyzer

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

    • -1
    • +87
    ./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
    • +23
    ./5.3.x/install/cache/class_structure.php
    • -0
    • +1
    ./5.3.x/install/cache/.gitignore

Bug INP-1369 - Transform all hooks to "OnAfterConfigRead" event into hBEFORE

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

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

    • -2
    • +2
    ./5.3.x/units/links/link_tag_processor.php
    • -2
    • +2
    ./5.3.x/admin_templates/user_item_tab.tpl
    • -2
    • +2
    ./5.3.x/admin_templates/catalog_tab.tpl

Bug: INP-921 - Prepare 5.2.x releases

1. preparing In-Link 5.2.1 release

Bug INP-1378 - Force escape "m_Get" tag output

    • -2
    • +2
    ./5.2.x/admin_templates/user_item_tab.tpl
    • -2
    • +2
    ./5.2.x/admin_templates/catalog_tab.tpl

Fixes MINL-16 - Getting out of memory on the Link detail page

1. commit on behalf of Erik

    • -2
    • +2
    ./5.2.x/units/links/link_tag_processor.php

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