branches

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

Fixes INP-1727 - Don't pass any unit info in "No Permission" redirects

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

Fixes INP-1726 - Add "Source" button to Content Blocks, edited in inline mode

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

    • -0
    • +121
    ./5.2.x/core/ckeditor/plugins/sourcedialog/samples/sourcedialog.html
  1. ./5.2.x/core/ckeditor/plugins/sourcedialog/lang
    • -0
    • +29
    ./5.2.x/core/ckeditor/plugins/sourcedialog/plugin.js
    • -0
    • +9
    ./5.2.x/core/ckeditor/plugins/sourcedialog/lang/en.js
  2. ./5.2.x/core/ckeditor/plugins/sourcedialog/icons/hidpi
  3. ./5.2.x/core/ckeditor/plugins/sourcedialog

Fixes INP-1724 - Define "EDITING_MODE" constant, when not present

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

Fixes INP-1719 - Only resize fully uploaded file

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

    • -11
    • +17
    ./5.2.x/core/units/helpers/upload_helper.php

Fixes INP-1718 - HTML-escape the "m_Get" tag result only once

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

    • -1
    • +3
    ./5.2.x/core/kernel/processors/main_processor.php

Fixes INP-1717 - Don't use "no_html_escape" attribute with "m_Get" tag

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

  1. … 6 more files in changeset.

Fixes INP-1716 - Properly escape "m_Get" tag usages inside JavaScript code

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

Fixes INP-498 - Block grid auto-refresh, when Modal Window is opened

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

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
    • -7
    • +21
    ./5.3.x/core/kernel/utility/http_query.php
    • -1
    • +1
    ./5.3.x/core/units/helpers/navigation_bar.php
  1. … 57 more files in changeset.

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

    • -6
    • +16
    ./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

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

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

    • -6
    • +16
    ./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

    • -13
    • +39
    ./5.2.x/core/units/helpers/upload_helper.php

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

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

    • -6
    • +18
    ./5.3.x/core/admin_templates/js/forms.js

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

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

    • -4
    • +21
    ./5.3.x/core/units/helpers/fck_helper.php

Fixes INP-1660 - Make CKEditor styles dropdown larger

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

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

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

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

    • -7
    • +11
    ./5.2.x/core/kernel/utility/http_query.php

Fixes INP-1706 - Generate assets during deployment

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

    • -0
    • +13
    ./5.2.x/core/units/helpers/deployment_helper.php
    • -5
    • +0
    ./5.2.x/core/units/helpers/themes_helper.php

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

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

    • -2
    • +4
    ./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
    ./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

    • -1
    • +1
    ./5.2.x/core/units/users/users_config.php

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

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

    • -0
    • +4
    ./5.2.x/core/units/themes/theme_item.php
    • -1
    • +5
    ./5.2.x/core/units/languages/languages_item.php

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

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

    • -1
    • +5
    ./5.2.x/core/units/forms/forms/forms_config.php
    • -3
    • +3
    ./5.2.x/core/units/phrases/phrases_config.php
    • -5
    • +1
    ./5.2.x/core/units/reviews/reviews_config.php
  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

    • binary
    ./5.2.x/core/units/helpers/minifiers/yuicompressor-2.4.8.jar