Dashboard

Merge of "in-portal/branches/5.2.x@16599" to "in-portal/branches/5.3.x@16597".

Conflicts:

  • core/admin_templates/categories/categories_edit.tpl
  • core/admin_templates/forms/form_edit_emails.tpl
  • core/admin_templates/forms/forms_edit.tpl
  • core/admin_templates/incs/form_blocks.tpl
  • core/admin_templates/languages/email_template_edit.tpl
  • core/admin_templates/mailing_lists/mailing_list_edit.tpl
  • core/admin_templates/popups/translator.tpl
  • core/admin_templates/promo_blocks/promo_block_edit.tpl
  • core/admin_templates/regional/email_template_edit.tpl
  • core/admin_templates/regional/languages_edit.tpl
  • core/install/english.lang
  • core/install/install_data.sql
  • core/install/upgrades.css
  • core/install/upgrades.sql
  • core/kernel/constants.php
  • core/kernel/utility/email.php
  • core/kernel/utility/formatters/date_formatter.php
  • core/units/categories/categories_event_handler.php
  • core/units/email_queue/email_queue_eh.php
  • core/units/email_templates/email_template_eh.php
  • core/units/helpers/csv_helper.php
  • core/units/helpers/deployment_helper.php
  • core/units/helpers/mailing_list_helper.php
  • core/units/helpers/skin_helper.php
  • core/units/mailing_lists/mailing_list_eh.php
    • -1
    • +14
    /branches/5.3.x/core/install/upgrades.sql
  1. … 57 more files in changeset.

[backported] Fixes INP-1722 - [bc fix] Asynchronous e-mail sending by default

    • -6
    • +16
    /branches/5.2.x/core/kernel/utility/email.php

[backported] Fixes INP-1723 - Asynchronous e-mail sending by default

Conflicts:

  • core/admin_templates/mailing_lists/send_queue.tpl
  • core/install/upgrades.sql
  • core/kernel/constants.php
  • core/units/email_templates/email_template_eh.php
  • core/units/helpers/mailing_list_helper.php
  • core/units/mailing_lists/mailing_list_eh.php
    • -0
    • +3
    /branches/5.2.x/core/install/english.lang
    • -0
    • +2
    /branches/5.2.x/core/install/upgrades.sql
    • -0
    • +1
    /branches/5.2.x/core/install/install_data.sql
    • -5
    • +10
    /branches/5.2.x/core/kernel/constants.php

Fixes INP-1710 - [bc fix] Asynchronous e-mail sending by default

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

    • -6
    • +16
    /branches/5.3.x/core/kernel/utility/email.php

Fixes INP-1720 - Use "FileHelper::urlToPath" for "storage_format" field option handling

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

Fixes INP-1698 - Allow using CKEditor and CodeMirror on same textarea

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

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

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

Bug INP-1660 - Make CKEditor styles dropdown larger

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

    • -0
    • +6
    /branches/1.2.x/platform/inc/styles.css

Fixes INP-1660 - Make CKEditor styles dropdown larger

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

    • -0
    • +16
    /branches/5.2.x/core/install/upgrades.css
    • -1
    • +1
    /branches/5.2.x/core/install/install_data.sql

Fixes INP-1709 - Validate "Categories.FriendlyURL" field for uniqueness

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

    • -0
    • +1
    /branches/5.2.x/core/install/english.lang

Fixes INP-1708 - Ignore crop/fill parameters during image resize, when they have no effect

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

Fixes INP-1707 - Unset "Proxy" header for Web Requests

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

Fixes INP-1706 - Generate assets during deployment

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

    • -0
    • +4
    /branches/5.2.x/core/install/upgrades.sql
    • -1
    • +3
    /branches/5.2.x/core/install/english.lang

Fixes INP-1705 - Make "Session::NeedQueryString" method always return "false" when in CLI

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

    • -2
    • +4
    /branches/5.2.x/core/kernel/session/session.php

Fixes INP-1704 - Use strict comparison in "Session::NeedQueryString" method

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

    • -2
    • +2
    /branches/5.2.x/core/kernel/session/session.php

Fixes INP-1703 - Set default expiration for font assets

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

Fixes INP-1700 - Translate invalid username phrase

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

    • -0
    • +1
    /branches/5.2.x/core/install/english.lang

Fixes INP-1699 - Don't cache language/theme while in temp mode

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

Bug INP-1697 - Automate usage of "allow_html" block parameter

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

Bug INP-1697 - Automate usage of "allow_html" block parameter

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

    • -1
    • +1
    /branches/5.2.x/units/links/links_config.php

Bug INP-1697 - Automate usage of "allow_html" block parameter

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

    • -2
    • +2
    /branches/5.2.x/units/orders/orders_config.php

Bug INP-1697 - Automate usage of "allow_html" block parameter

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

    • -4
    • +1
    /branches/5.2.x/units/topics/topics_config.php

Bug INP-1697 - Automate usage of "allow_html" block parameter

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

Fixes INP-1697 - Automate usage of "allow_html" block parameter

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

  1. … 5 more files in changeset.

Fixes INP-1696 - Automatically generate value for missing "max_size" field option

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

Fixes INP-1701 - Enable client-side file size checks in Plupload

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

Fixes INP-1695 - Automatically generate value for missing "upload_dir" field option

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

Fixes INP-1694 - Upgrade YUICompressor to v2.4.8

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

Fixes INP-1693 - Show all performed actions during deployment in synchronization mode

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

Fixes INP-1691 - Return user_id, when "Remember Login" is used in "UserHelper::getUserId" method

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