branches

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

Merge of "in-portal/branches/5.2.x@16691" to "in-portal/branches/5.3.x@16718".

Conflicts:

  • composer.json
  • composer.lock
  • core/kernel/application.php
    • -0
    • +3
    ./5.3.x/core/install/prerequisites.php

Fixes INP-1791 - Add "picker" control type for configuration settings

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

Fixes INP-1812 - Change "LeftJoinOptimizer" to find table aliases usage only at word boundaries

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

Fixes INP-1816 - Use argument-based cache in the "kApplication::GetDefaultThemeId" method

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

    • -11
    • +13
    ./5.2.x/core/kernel/application.php

Fixes INP-1815 - Anonymize error message content for Regular Website Visitors

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

    • -1
    • +17
    ./5.2.x/core/kernel/utility/logger.php

Fixes INP-1814 - Use relative paths in error messages

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

    • -2
    • +14
    ./5.2.x/core/kernel/utility/logger.php

Fixes INP-1645 - Create categories during theme scan based on their location in SMS

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

Fixes INP-1792 - Support HTML markup with Title Presets

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

Fixes INP-1794 - Show database query execution times during deployment

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

    • -3
    • +87
    ./5.2.x/core/units/helpers/deployment_helper.php

Fixes INP-1796 - Add method for setting database error handler

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

    • -0
    • +10
    ./5.2.x/core/kernel/db/i_db_connection.php
    • -1
    • +1
    ./5.2.x/core/units/helpers/deployment_helper.php
    • -5
    • +16
    ./5.2.x/core/kernel/db/db_connection.php

Fixes INP-1797 - Speed up formatter class access from "kDBItem"

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

    • -13
    • +13
    ./5.2.x/core/kernel/db/dbitem.php

Fixes INP-1798 - Include validation errors and temp mode flag in kDBItem validation error message

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

    • -5
    • +19
    ./5.2.x/core/kernel/utility/validator.php

Fixes INP-1800 - Remove duplicate primary theme detection query

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

    • -9
    • +3
    ./5.2.x/core/units/helpers/themes_helper.php

Fixes INP-1801 - Use dynamic protocol during installation

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

Fixes INP-1802 - Speed up detection of countries with states

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

Fixes INP-1803 - Show non-executed SQLs during deployment

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

    • -4
    • +28
    ./5.2.x/core/units/helpers/deployment_helper.php

Fixes INP-1805 - Execute "adm:OnBeforeShutdown" event before AJAX request ending

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

    • -0
    • +1
    ./5.2.x/core/kernel/managers/request_manager.php

Fixes INP-1806 - Display output of executed MySQL commands during build script execution

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

Fixes INP-1807 - Use dedicated connection for "kLogger" class

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

    • -4
    • +31
    ./5.2.x/core/kernel/utility/logger.php

Fixes INP-1808 - Create "E-mail Log" records using corresponding unit

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

    • -2
    • +12
    ./5.2.x/core/kernel/utility/email_send.php

Fixes INP-1810 - Use linked info in "OnNew" event only, when it's available

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

Fixes INP-1757 - Replace "each" function usage with equivalent code

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

    • -3
    • +6
    ./5.2.x/core/units/users/users_event_handler.php
    • -2
    • +2
    ./5.2.x/core/units/helpers/captcha_helper.php
    • -1
    • +2
    ./5.2.x/core/units/theme_files/theme_file_eh.php
    • -2
    • +0
    ./5.2.x/core/units/helpers/brackets_helper.php
    • -1
    • +1
    ./5.2.x/core/units/helpers/file_helper.php
    • -3
    • +6
    ./5.2.x/core/units/helpers/search_helper.php
  1. … 5 more files in changeset.

Fixes INP-1756 - Create "Security*" classes for security-related jobs

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

    • -0
    • +3
    ./5.2.x/core/install/prerequisites.php
    • -0
    • +193
    ./5.2.x/core/kernel/security/SecurityGenerator.php
    • -0
    • +228
    ./5.2.x/core/kernel/security/SecurityEncrypter.php
    • -0
    • +274
    ./5.2.x/core/kernel/security/SecurityGeneratorPromise.php

Fixes INP-1476 - Allow to customize "st_AdminEditButton" tag

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

Fixes INP-1560 - Migrate "mysql" to "mysqli" database type during upgrade

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

Fixes INP-1654 - Handle resource type in System Log

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

    • -0
    • +3
    ./5.2.x/core/kernel/utility/logger.php

Fixes INP-1702 - Validate file type/size during upload on server side

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

    • -8
    • +22
    ./5.2.x/core/units/helpers/upload_helper.php
    • -0
    • +21
    ./5.2.x/core/units/helpers/file_helper.php

Fixes INP-1711 - Add vertical scrollbar to "grid_multioptions_filter" filter

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

Fixes INP-1729 - Use "preg_replace_callback" instead of "preg_replace" with "e" modifier

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

    • -4
    • +12
    ./5.2.x/core/kernel/utility/email_send.php

Fixes INP-1737 - Fallback to category title on primary language in Admin Console

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