In-Portal

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

Merge of "in-portal/branches/5.2.x@16439" to "in-portal/branches/5.3.x@16429".

[backported] Fixes INP-1631 - Use "array_replace_recursive" inside kSystemConfig class

[backported] Fixes INP-1632 - Use "path" in from DBG_EDITOR_URL constant only when available

    • -1
    • +5
    /branches/5.2.x/core/kernel/utility/debugger.php

[backported] Fixes INP-1633 - Optimize unit config search

Conflicts:

  • core/kernel/utility/unit_config_reader.php

[backported] Fixes INP-1634 - Use "http_build_query" for file editing link building

    • -2
    • +37
    /branches/5.2.x/core/kernel/utility/debugger.php

[backported] Fixes INP-1638 - Create intermediate class to access /system/config.php file

Conflicts:

  • core/install/install_toolkit.php
  • core/units/helpers/modules_helper.php
    • -2
    • +1
    /branches/5.2.x/core/kernel/utility/debugger.php
    • -1
    • +2
    /branches/5.2.x/core/kernel/application.php
    • -57
    • +39
    /branches/5.2.x/core/install.php
    • -55
    • +6
    /branches/5.2.x/core/kernel/globals.php
  1. … 13 more files in changeset.

[backported] Fixes INP-1637 - Use "System Log" to log HTTP requests

    • -3
    • +1
    /branches/5.2.x/core/kernel/application.php
    • -1
    • +1
    /branches/5.2.x/tools/debug_sample.php

[backported] Fixes INP-1636 - Show custom fields on Administrator adding/editing

[backported] Fixes INP-1635 - Create IDBConnection interface

Conflicts:

  • core/kernel/db/db_connection.php
  • core/kernel/utility/unit_config.php
    • -4
    • +4
    /branches/5.2.x/core/kernel/application.php
    • -0
    • +1
    /branches/5.2.x/core/kernel/startup.php
  1. … 7 more files in changeset.

Merge of "in-portal/branches/5.2.x@16428" to "in-portal/branches/5.3.x@16395".

[backported] Fixes INP-1602 - Make styleSet name configurable in FCKEditor tag

[backported] Fixes INP-1601 - Perform search, when ENTER used in "grid_like_combo_filter" block (the jQueryUI.Autocomplete)

[backported] Fixes INP-1604 - Adapt error output for CLI

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

[backported] Fixes INP-1629 - Change CKEditor style loading to allow working on Front-End

[backported] Fixes INP-1607 - PHP 7 compatibility issues

    • -10
    • +1
    /branches/5.2.x/core/kernel/db/db_connection.php
    • -42
    • +31
    /branches/5.2.x/core/kernel/db/dblist.php

[backported] Fixes INP-1606 - CKEditor anchor query shouldn't set last visited template

[backported] Fixes INP-1605 - Don't calculate "profiler enabled" state each time in class factory

Conflicts:

  • core/kernel/utility/factory.php
    • -2
    • +2
    /branches/5.2.x/core/kernel/application.php
    • -80
    • +98
    /branches/5.2.x/core/kernel/utility/factory.php

[backported] Fixes INP-1610 - Don't call "refreshModuleInfo" twice in a row

[backported] Fixes INP-1609 - Don't report empty forms as missing

Conflicts:

  • core/kernel/kbase.php

[backported] Fixes INP-1608 - Register own auto-loader before others

    • -1
    • +1
    /branches/5.2.x/core/kernel/utility/factory.php

[backported] Fixes INP-1615 - Reset cached sorting on sorting configuration change

[backported] Fixes INP-1613 - Integrate Plupload

Conflicts:

  • core/kernel/db/db_event_handler.php
  1. … 6 more files in changeset.

[backported] Fixes INP-1625 - Add support for using jQueryUI Autocomplete

Conflicts:

  • core/admin_templates/js/ajax_dropdown.js
  1. … 24 more files in changeset.

[backported] Fixes INP-1626 - Add 'admin' meta-permission

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

    • -1
    • +1
    /branches/5.2.x/core/kernel/application.php

[backported] Fixes INP-1614 - Create fallback for missing *Ajax events

    • -0
    • +47
    /branches/5.2.x/core/kernel/event_handler.php

[backported] Fixes INP-1622 - Create message filter for Debugger Report

Conflicts:

  • core/kernel/utility/debugger.php
    • -2
    • +71
    /branches/5.2.x/core/kernel/utility/debugger.php

[backported] Fixes INP-1617 - Implement inline editing in CKEditor

Conflicts:

  • core/admin_templates/js/template_manager.js
  • core/kernel/db/db_tag_processor.php
  • core/units/content/content_eh.php
    • -0
    • +1
    /branches/5.2.x/core/install/english.lang
  1. … 14 more files in changeset.

[backported] Fixes INP-1618 - Append new column to the grid at designated position

Conflicts:

  • core/units/admin/admin_tag_processor.php
  • core/units/helpers/col_picker_helper.php
  • core/units/helpers/csv_helper.php

[backported] Fixes INP-1621 - Migrate to MySQLi Driver

Conflicts:

  • core/kernel/db/db_connection.php
  • core/kernel/utility/temp_handler.php
    • -2
    • +2
    /branches/5.2.x/core/kernel/startup.php
    • -1
    • +1
    /branches/5.2.x/core/install/prerequisites.php
    • -163
    • +61
    /branches/5.2.x/core/kernel/db/db_connection.php