system_presets

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

Fixes INP-1583 - Add support for "Content Templates" inside CKEditor

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

  1. … 2 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
    • +1
    ./simple/email_templates_email-template.php
  1. … 8 more files in changeset.

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

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

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

    • -4
    • +8
    ./simple/email_templates_email-template.php
  1. … 4 more files in changeset.

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

  1. … 85 more files in changeset.

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

  1. … 20 more files in changeset.

Fixes INP-1309 - Implement inline editing

  1. … 18 more files in changeset.

Fixes INP-1300 - Upgrade to CKEditor 4.2

  1. … 759 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".

    • -0
    • +54
    ./simple/system_logs_system-log.php
  1. … 149 more files in changeset.

Creating '.gitignore' files to preserve empty folders during Git migration

  1. … 6 more files in changeset.

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

    • -5
    • +5
    ./simple/system_event_subscriptions_system-event-subscription.php
    • -68
    • +0
    ./simple/email_events_emailevents.php
    • -0
    • +64
    ./simple/email_templates_email-template.php
  1. … 186 more files in changeset.

Bug #0001023: Ability to Keep Language Packs in Sync

INP-825

  1. … 32 more files in changeset.

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

    • -0
    • +51
    ./simple/session_logs_session-log.php
    • -0
    • +20
    ./simple/sections_core-sections.php
    • -0
    • +43
    ./simple/related_searches_search.php
  1. … 2409 more files in changeset.