Checkout
 

alex in In-Portal

Fixes INP-1758 - Support PHP_CodeSniffer 3.x

    • -314
    • +275
    /branches/5.2.x/composer.lock
    • -1
    • +0
    /branches/5.2.x/tools/build/targets/common.xml

Fixes INP-1744 - Make page content blocks searcheable

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

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

Fixes INP-1721 - Correct math for detecting allowed file size during upload

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

    • -1
    • +0
    /branches/5.2.x/core/kernel/startup.php
    • -0
    • +32
    /branches/5.2.x/core/kernel/application.php
    • -0
    • +27
    /branches/5.2.x/core/kernel/globals.php

Committing 'svn:externals' property to 'releases/5.2.2-B2' in 'in-portal' module.

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

Fixes INP-1736 - Make "\kNavigationBar::getCategoryParentPath" method language-aware

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

Fixes INP-1735 - Normalize block parameter values, used during function name creation

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

    • -2
    • +17
    /branches/5.2.x/core/kernel/nparser/ntags.php

Fixes INP-1733 - Remove ".tmp" sub-extension from sub-item uploaded files

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

    • -0
    • +8
    /branches/5.2.x/core/kernel/db/dbitem.php

Fixes INP-1732 - Create user session, when search is performed

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

Fixes INP-1731 - Add support for "_" in option keys in grid filters and editing controls

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

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
    • +29
    /branches/5.2.x/core/ckeditor/plugins/sourcedialog/plugin.js

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

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

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

Fixes INP-1719 - Only resize fully uploaded file

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

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

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

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

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

    • -1
    • +1
    /branches/5.2.x/core/admin_templates/head.tpl
  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
    • -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

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