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

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

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

    • -1
    • +1
    ./core/units/helpers/upload_helper.php

Merge of "in-portal/releases/5.2.1-B2@15839" to "in-portal/branches/5.3.x@15852".

Merge of "in-portal/releases/5.2.1-RC1@15881" to "in-portal/branches/5.3.x@15852".

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

    • -2
    • +4
    ./core/kernel/utility/temp_handler.php
    • -16
    • +16
    ./core/admin_templates/js/forms.js

Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.x@15659".

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

2. other changes were already restored in: 15680, 15902, 16323

Fixes INP-1539 - Make styleSet name configurable in FCKEditor tag

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

    • -7
    • +15
    ./core/units/helpers/fck_helper.php

Fixes INP-1157 - Support for user-defined fields in "st_CachedMenu" tag

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

    • -1
    • +76
    ./core/units/helpers/menu_helper.php

Fixes INP-1545 - Enable SQL syntax highlight in "Tools > Query Database" section

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

    • -2
    • +2
    ./core/admin_templates/tools/sql_query.tpl

Fixes INP-1549 - The "grid_like_combo_filter" doesn't trigger search on ENTER press (the jQueryUI.Autocomplete)

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

    • -2
    • +7
    ./core/admin_templates/incs/grid_blocks.tpl

Fixes INP-1522 - Adapt error output for CLI

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

Fixes INP-1511 - Presets for category items export

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

    • -0
    • +122
    ./core/admin_templates/incs/form_blocks.tpl

Fixes INP-1510 - Allow rotation of "Session Log" and "Changes Log"

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

Fixes INP-1515 - Allow to enable/disable the Site Domain

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

Fixes INP-1495 - Use "array_replace_recursive" inside kSystemConfig class

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

    • -2
    • +2
    ./core/kernel/utility/system_config.php

Fixes INP-1499 - Don't use auto-loader for inclusion of ClassMapBuilder class from kFactory

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

Fixes INP-1500 - Remove excessing <%TABLE_PREFIX%> usages in "upgrades.sql" file

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

Fixes INP-1501 - Replace "emailevents" with "email-template" in 5.3.x upgrade script

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

Fixes INP-1505 - Restore e-mail template translation sync code removed during merge

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

Fixes INP-1517 - Define INDEX_FILE constant in each CLI script

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

Fixes INP-1518 - Remove excessive owner detection code from "cacheItemOwner" method

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

    • -15
    • +0
    ./core/kernel/db/cat_event_handler.php

Fixes INP-1519 - Generate e-mail access key after subject is prepared

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

Fixes INP-1523 - Populate user info, when sending membership expiration e-mails

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

    • -8
    • +17
    ./core/units/users/users_event_handler.php

Fixes INP-1489 - Initialize properties of ProcessBuilder class with null

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

    • -4
    • +6
    ./core/kernel/utility/ProcessBuilder.php

Fixes INP-1484 - Connect "Symfony Process" component

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

    • -0
    • +8
    ./core/install/cache/class_structure.php
    • -0
    • +307
    ./core/kernel/utility/ProcessBuilder.php

Fixes INP-1485 - Create "AbstractCommand::initDependencies" method

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

    • -1
    • +45
    ./core/kernel/Console/Command/AbstractCommand.php
    • -16
    • +4
    ./core/kernel/Console/Command/RunEventCommand.php
    • -3
    • +1
    ./core/install/cache/class_structure.php

Fixes INP-1482 - Add "ConsoleIO" class

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

    • -0
    • +5
    ./core/install/cache/class_structure.php
    • -0
    • +11
    ./core/kernel/Console/Command/AbstractCommand.php
    • -0
    • +230
    ./core/kernel/Console/ConsoleIO.php

Fixes INP-1483 - Use "path" in from DBG_EDITOR_URL constant only when available

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

Fixes INP-1464 - Optimize unit config search

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

    • -16
    • +23
    ./core/kernel/utility/unit_config_reader.php

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

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

  1. … 165 more files in changeset.

Fixes INP-1416 - Can't edit content block when no stylesheet file defined in the current theme

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

Fixes INP-1448 - Support "pass_through" parameter in "adm:SelectorLink" tag

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

    • -2
    • +2
    ./core/admin_templates/users/user_edit_items.tpl
    • -3
    • +3
    ./core/admin_templates/reviews/reviews.tpl
    • -23
    • +49
    ./core/units/admin/admin_tag_processor.php

Fixes INP-1445 - Inline CKEditor styles aren't working

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