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

Merge of "in-portal/branches/5.2.x@16513" to "in-portal/branches/5.3.x@16503".

Conflicts:

  • core/install.php
  • core/install/install_toolkit.php
  • core/kernel/application.php
  • core/kernel/db/cat_event_handler.php
  • core/kernel/db/cat_tag_processor.php
  • core/kernel/db/db_event_handler.php
  • core/kernel/db/db_tag_processor.php
  • core/kernel/db/dblist.php
  • core/kernel/kbase.php
  • core/kernel/managers/plain_url_processor.php
  • core/kernel/managers/rewrite_url_processor.php
  • core/kernel/processors/main_processor.php
  • core/kernel/session/session.php
  • core/kernel/utility/event.php
  • core/kernel/utility/formatters/multilang_formatter.php
  • core/kernel/utility/temp_handler.php
  • core/units/categories/categories_event_handler.php
  • core/units/categories/categories_tag_processor.php
  • core/units/custom_fields/custom_fields_event_handler.php
  • core/units/email_templates/email_template_eh.php
  • core/units/email_templates/email_template_tp.php
  • core/units/favorites/favorites_eh.php
  • core/units/forms/form_submissions/form_submissions_eh.php
  • core/units/forms/submission_log/submission_log_eh.php
  • core/units/helpers/cat_dbitem_export_helper.php
  • core/units/helpers/csv_helper.php
  • core/units/helpers/mod_rewrite_helper.php
  • core/units/helpers/sections_helper.php
  • core/units/helpers/themes_helper.php
  • core/units/logs/session_logs/session_log_eh.php
  • core/units/mailing_lists/mailing_list_eh.php
  • core/units/modules/modules_event_handler.php
  • core/units/modules/modules_tag_processor.php
  • core/units/page_revisions/page_revision_eh.php
  • core/units/priorites/priority_eh.php
  • core/units/scheduled_tasks/scheduled_task_eh.php
  • core/units/site_domains/site_domain_eh.php
  • core/units/statistics/statistics_tag_processor.php
  • core/units/user_groups/user_groups_eh.php
  • core/units/users/users_event_handler.php
  1. … 174 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
  1. … 110 more files in changeset.

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

  1. … 8 more files in changeset.

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

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

    • -1
    • +5
    ./session_logs/session_logs_config.php
  1. … 3 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
    • +1
    ./module_deployment_logs/module_deployment_logs_config.php
    • -1
    • +1
    ./module_deployment_logs/module_deployment_log_eh.php
  1. … 178 more files in changeset.

Fixes INP-1274 - Move deployment script log to database

    • -0
    • +126
    ./module_deployment_logs/module_deployment_logs_config.php
    • -0
    • +54
    ./module_deployment_logs/module_deployment_log_eh.php
  1. … 17 more files in changeset.

Fixes INP-1304 - Write e-mail processing errors to "E-mail Log"

  1. … 7 more files in changeset.

Fixes INP-1204 - Association between e-mail log e-mails and corresponding items from Catalog

  1. … 16 more files in changeset.

Fixes INP-1302 - Use build-in date manipulation functions instead of adodb library

  1. … 55 more files in changeset.

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. … 149 more files in changeset.

Fixes INP-1280 - Ensure presence of 'parent_event' parameter in majority kTempTablesHandler usages

  1. … 9 more files in changeset.

Fixes INP-1203: OOP unit config creation

  1. … 115 more files in changeset.

Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.x@15659".

  1. … 187 more files in changeset.

Fixes #0001399: Remove "ItemSQLs" from unit configs

INP-1156

    • -59
    • +60
    ./search_logs/search_logs_config.php
    • -15
    • +15
    ./system_logs/system_logs_config.php
    • -122
    • +119
    ./change_logs/change_logs_config.php
    • -115
    • +113
    ./session_logs/session_logs_config.php
    • -74
    • +75
    ./email_logs/email_logs_config.php
  1. … 60 more files in changeset.

Bug #0001023: Ability to Keep Language Packs in Sync

INP-825

  1. … 33 more files in changeset.

Bug #0001003: Logging engine

1. Merging to 5.3.x to prevent conflicts on "System Log" commit merging

INP-811

    • -0
    • +205
    ./system_logs/system_logs_config.php
  1. … 23 more files in changeset.

Releasing version 'branches/5.3.x' (copy from 'branches/5.2.x') of 'in-portal' module.

    • -0
    • +84
    ./change_logs/changes_formatter.php
    • -0
    • +155
    ./session_logs/session_logs_config.php
    • -0
    • +160
    ./change_logs/change_logs_config.php
    • -0
    • +130
    ./session_logs/session_log_eh.php
    • -0
    • +92
    ./search_logs/search_logs_config.php
    • -0
    • +109
    ./email_logs/email_logs_config.php
  1. … 2409 more files in changeset.