branches

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

[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
    ./5.2.x/core/kernel/utility/debugger.php
    • -9
    • +10
    ./5.2.x/core/units/helpers/modules_helper.php
  1. … 13 more files in changeset.

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

    • -24
    • +1
    ./5.2.x/core/kernel/processors/main_processor.php
    • -4
    • +7
    ./5.2.x/core/kernel/utility/logger.php
    • -40
    • +30
    ./5.2.x/core/kernel/utility/http_query.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
    • -0
    • +262
    ./5.2.x/core/kernel/db/i_db_connection.php
    • -22
    • +184
    ./5.2.x/core/kernel/db/db_load_balancer.php
    • -1
    • +1
    ./5.2.x/core/units/users/users_syncronize.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

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

[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
    ./5.2.x/core/kernel/utility/logger.php

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

    • -1
    • +3
    ./5.2.x/core/units/helpers/fck_helper.php

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

    • -10
    • +1
    ./5.2.x/core/kernel/db/db_connection.php
    • -5
    • +4
    ./5.2.x/core/units/helpers/json_helper.php
    • -5
    • +5
    ./5.2.x/core/units/helpers/mailbox_helper.php
    • -42
    • +31
    ./5.2.x/core/kernel/db/dblist.php
    • -1
    • +4
    ./5.2.x/core/install/install_toolkit.php
    • -4
    • +13
    ./5.2.x/core/units/categories/cache_updater.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
    • -80
    • +98
    ./5.2.x/core/kernel/utility/factory.php

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

    • -2
    • +0
    ./5.2.x/core/install/install_toolkit.php

[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
    ./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
    • binary
    ./5.2.x/core/admin_templates/swfupload.swf
    • -0
    • +332
    ./5.2.x/core/units/helpers/upload_helper.php
    • -201
    • +37
    ./5.2.x/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
    • -15
    • +64
    ./5.2.x/core/kernel/db/db_event_handler.php
  1. … 24 more files in changeset.

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

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

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

    • -0
    • +47
    ./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
    • +37
    ./5.2.x/core/kernel/utility/debugger/debugger.js
    • -2
    • +71
    ./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
    • -155
    • +16
    ./5.2.x/core/kernel/db/db_tag_processor.php
    • -28
    • +41
    ./5.2.x/core/units/content/content_eh.php
  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
    • -5
    • +3
    ./5.2.x/core/units/helpers/csv_helper.php
    • -13
    • +17
    ./5.2.x/core/units/admin/admin_tag_processor.php
    • -167
    • +450
    ./5.2.x/core/units/helpers/col_picker_helper.php
    • -16
    • +12
    ./5.2.x/core/kernel/db/db_tag_processor.php

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

Conflicts:

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

[backported] Fixes INP-1623 - Improve cross-browser support in Category Item Selector

[backported] Fixes INP-1619 - Disable content revision toolbar related js code when toolbar is disabled

Conflicts:

  • core/admin_templates/js/template_manager.js

[backported] Fixes INP-1620 - Upgrade to CKEditor 4.2

    • -86
    • +112
    ./5.2.x/core/ckeditor/ckfinder/lang/hu.js
    • -9
    • +35
    ./5.2.x/core/ckeditor/ckfinder/lang/it.js
  1. … 755 more files in changeset.

Merge of "in-portal/branches/5.2.x@16388" to "in-portal/branches/5.3.x@16391".

Conflicts:

  • composer.lock
  • core/admin_templates/catalog/advanced_view.tpl
  • core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
  • core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
  • core/admin_templates/config/config_edit.tpl
  • core/admin_templates/incs/form_blocks.tpl
  • core/admin_templates/incs/grid_blocks.tpl
  • core/admin_templates/js/ajax_dropdown.js
  • core/admin_templates/js/template_manager.js
  • core/admin_templates/mailing_lists/send_queue.tpl
  • core/admin_templates/reviews/reviews.tpl
  • core/admin_templates/users/user_edit_items.tpl
  • core/install/english.lang
  • core/install/install_data.sql
  • core/install/install_toolkit.php
  • core/install/upgrades.php
  • core/install/upgrades.sql
  • core/kernel/application.php
  • core/kernel/db/cat_event_handler.php
  • core/kernel/db/db_event_handler.php
  • core/kernel/db/db_tag_processor.php
  • core/kernel/kbase.php
  • core/kernel/managers/url_manager.php
  • core/kernel/nparser/nparser_config.php
  • core/kernel/session/session.php
  • core/kernel/utility/event.php
  • core/kernel/utility/factory.php
  • core/kernel/utility/http_query.php
  • core/kernel/utility/unit_config_reader.php
  • core/units/admin/admin_config.php
  • core/units/admin/admin_tag_processor.php
  • core/units/categories/categories_config.php
  • core/units/categories/categories_event_handler.php
  • core/units/category_items/category_items_config.php
  • core/units/email_queue/email_queue_config.php
  • core/units/forms/form_fields/form_fields_config.php
  • core/units/forms/form_submissions/form_submissions_config.php
  • core/units/forms/forms/forms_config.php
  • core/units/general/general_config.php
  • core/units/helpers/image_helper.php
  • core/units/helpers/language_import_helper.php
  • core/units/helpers/modules_helper.php
  • core/units/images/images_config.php
  • core/units/logs/change_logs/change_logs_config.php
  • core/units/logs/email_logs/email_logs_config.php
  • core/units/logs/session_logs/session_logs_config.php
  • core/units/mailing_lists/mailing_lists_config.php
  • core/units/modules/modules_config.php
  • core/units/page_revisions/page_revisions_config.php
  • core/units/permissions/permissions_event_handler.php
  • core/units/permissions/permissions_tag_processor.php
  • core/units/phrases/phrases_config.php
  • core/units/reviews/reviews_config.php
  • core/units/scheduled_tasks/scheduled_task_eh.php
  • core/units/scheduled_tasks/scheduled_tasks_config.php
  • core/units/sections/sections_config.php
  • core/units/site_domains/site_domains_config.php
  • core/units/structure/structure_config.php
  • core/units/themes/themes_config.php
  • core/units/user_groups/user_groups_config.php
  • core/units/users/users_config.php
    • -3
    • +3
    ./5.3.x/core/ckeditor/ckfinder/config.php
    • -13
    • +35
    ./5.3.x/core/kernel/application.php
    • -9
    • +12
    ./5.3.x/core/admin_templates/tree.tpl
    • -0
    • +0
    ./5.3.x/core/admin_templates/js/cron.js
    • -6
    • +6
    ./5.3.x/tools/build/targets/folders.xml
    • -6
    • +6
    ./5.3.x/core/admin_templates/incs/cms.css
    • -1
    • +16
    ./5.3.x/core/kernel/nparser/nparser_config.php
    • -4
    • +7
    ./5.3.x/core/units/helpers/upload_helper.php
    • -2
    • +4
    ./5.3.x/core/units/helpers/page_helper.php
  1. … 96 more files in changeset.

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
    ./5.3.x/core/units/helpers/upload_helper.php