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

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
    • -7
    • +2
    ./permissions/permissions_tag_processor.php
    • -3
    • +11
    ./helpers/language_import_helper.php
    • -7
    • +2
    ./permissions/permissions_event_handler.php
    • -1
    • +1
    ./configuration/configuration_event_handler.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

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

    • -2
    • +2
    ./logs/system_logs/system_logs_config.php
    • -41
    • +41
    ./email_templates/email_templates_config.php
  1. … 3 more files in changeset.

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

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

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

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

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

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

    • -1
    • +69
    ./logs/session_logs/session_log_eh.php
  1. … 3 more files in changeset.

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

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

    • -3
    • +17
    ./site_domains/site_domains_config.php
  1. … 5 more files in changeset.

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

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

    • -12
    • +72
    ./email_templates/email_template_eh.php
    • -1
    • +41
    ./email_templates/email_template_tp.php
    • -4
    • +49
    ./email_templates/email_templates_config.php
  1. … 2 more files in changeset.

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

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

  1. … 2 more files in changeset.

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

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

  1. … 175 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

  1. … 5 more files in changeset.

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

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

Fixes INP-1436 - PHP 7 compatibility issues

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

  1. … 3 more files in changeset.

Fixes INP-1450 - Empty internal page dropdown during link adding in CKEditor

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

Fixes INP-1462 - Simplify "kEvent" class constructor

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

  1. … 3 more files in changeset.

Merge of "in-portal/branches/5.2.x@16189" to "in-portal/branches/5.3.x@16188".

    • -3
    • +7
    ./categories/categories_event_handler.php
  1. … 33 more files in changeset.

Fixes INP-1435 - Add Console command for running Scheduled Tasks

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

    • -33
    • +1
    ./scheduled_tasks/scheduled_task_eh.php
  1. … 5 more files in changeset.

Fixes INP-1426 - Speed up admin tree cache building

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

  1. … 1 more file in changeset.

Fixes INP-1079 - Routing Ideas

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

    • -256
    • +0
    ./categories/categories_event_handler.php
    • -356
    • +0
    ./helpers/mod_rewrite_helper.php
    • -0
    • +305
    ./general/MainRouter.php
  1. … 13 more files in changeset.

Fixes INP-1422 - Store class map on disk

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

    • -2
    • +2
    ./statistics/statistics_tag_processor.php
    • -1
    • +1
    ./categories/categories_event_handler.php
  1. … 28 more files in changeset.

Fixes INP-1315 - Reset cached sorting on sorting configuration change

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

    • -0
    • +37
    ./configuration/configuration_event_handler.php

Merge of "in-portal/branches/5.2.x@16121" to "in-portal/branches/5.3.x@16111".

    • -1
    • +1
    ./category_items/category_items_config.php
    • -0
    • +27
    ./languages/languages_event_handler.php
    • -1
    • +1
    ./category_items/category_items_event_handler.php
  1. … 28 more files in changeset.

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

    • -3
    • +3
    ./categories/categories_event_handler.php
    • -1
    • +3
    ./config_search/config_search_event_handler.php
    • -0
    • +1
    ./forms/form_fields/form_fields_config.php
    • -3
    • +2
    ./categories/categories_tag_processor.php
    • -8
    • +12
    ./helpers/cat_dbitem_export_helper.php
  1. … 71 more files in changeset.

Fixes INP-1391 - Allow to separately run deployment steps

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

Fixes INP-1316 - Add primary key to table, that don't have it

1. fixed changing user's primary group from user editing page

  1. … 1 more file in changeset.

Fixes INP-1331 - Integrate Plupload

    • -0
    • +337
    ./helpers/upload_helper.php
  1. … 9 more files in changeset.

Fixes INP-1328 - Unify BaseURL method logic for ssl and non-ssl urls

    • -3
    • +3
    ./site_domains/site_domains_config.php
    • -1
    • +1
    ./configuration/configuration_event_handler.php
  1. … 14 more files in changeset.

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

  1. … 11 more files in changeset.

Fixes INP-1251 - Add support for using jQueryUI Autocomplete

    • -12
    • +4
    ./email_templates/email_template_eh.php
    • -19
    • +18
    ./configuration/configuration_event_handler.php
    • -1
    • +1
    ./email_templates/email_templates_config.php
  1. … 26 more files in changeset.