In-Portal

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

[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
    /branches/5.2.x/core/ckeditor/ckfinder/lang/hu.js
    • -6
    • +0
    /branches/5.2.x/core/ckeditor/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
    • -13
    • +35
    /branches/5.3.x/core/kernel/application.php
    • -9
    • +12
    /branches/5.3.x/core/admin_templates/tree.tpl
    • -0
    • +44
    /branches/5.3.x/core/install/upgrades.php
    • -6
    • +6
    /branches/5.3.x/tools/build/targets/folders.xml
    • -3
    • +16
    /branches/5.3.x/core/kernel/kbase.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-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

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-1579 - Remove "ItemSQLs" from unit configs

    • -146
    • +134
    /branches/5.2.x/core/units/visits/visits_config.php
  1. … 59 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-1545 - Enable SQL syntax highlight in "Tools > Query Database" section

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

Fixes INP-1526 - Don't call "kDBEventHandler::checkItemStatus" when ID doesn't come from Web Request

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

    • -0
    • +3
    /branches/5.2.x/core/units/themes/themes_eh.php

Fixes INP-1567 - Register missing classes in class factory

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

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

Fixes INP-1570 - Make In-Portal Class Locator externally usable

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

    • -1
    • +19
    /branches/5.2.x/core/kernel/utility/factory.php
    • -0
    • +12
    /branches/5.2.x/core/kernel/application.php
    • -0
    • +37
    /branches/5.2.x/tools/class_locator.php

Fixes INP-1487 - Create empty search result table, when search keyword is too short

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

Fixes INP-1561 - Don't share Admin Console Menu Width across users

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

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

Fixes INP-1531 - Allow specifying default date/time for "inp_edit_date_time" control

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

Fixes INP-1528 - When attaching file to e-mail verify, that it's a file, not a directory

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

Fixes INP-1529 - Don't attach same file twice to same e-mail

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

Fixes INP-1530 - The "Image" tag must set DataExists flag for Template Parser

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

Fixes INP-1533 - Use "EXTR_SKIP" with "extract" function

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

Fixes INP-1535 - Escape referrer displayed during redirect debugging

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

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

Fixes INP-1536 - Escape url for JavaScript context during JavaScript made redirects

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

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

Fixes INP-1537 - The CS fix for "kUtil::array_merge_recursive" method

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

    • -9
    • +14
    /branches/5.2.x/core/kernel/globals.php

Fixes INP-1538 - Enable Mod-Rewrite by default

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

    • -1
    • +1
    /branches/5.2.x/core/install/install_data.sql

Fixes INP-1543 - Return detected theme/language ID immediately from "getPassedID" method

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

    • -0
    • +2
    /branches/5.2.x/core/units/themes/themes_eh.php

Fixes INP-1544 - Delete expired session without using "Session" object

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

Fixes INP-1546 - Make "user-profile:Field" tag support fields of any type

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

Fixes INP-1563 - Make "kApplication::QuickRun" method reusable

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

    • -6
    • +15
    /branches/5.2.x/core/kernel/application.php
    • -2
    • +6
    /branches/5.2.x/core/kernel/nparser/nparser.php