HomeIn-Portal Phabricator
Diffusion In-Portal rINP16600

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

Description

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

Details

Committed
alexJul 29 2017, 1:19 AM
Parents
rINP16599: [backported] Fixes INP-1722 - [bc fix] Asynchronous e-mail sending by default
rINP16598: [backported] Fixes INP-1723 - Asynchronous e-mail sending by default
rINP16596: Fixes INP-1720 - Use "FileHelper::urlToPath" for "storage_format" field option…
rINP16592: Fixes INP-1660 - Make CKEditor styles dropdown larger
rINP16591: Fixes INP-1709 - Validate "Categories.FriendlyURL" field for uniqueness
rINP16590: Fixes INP-1708 - Ignore crop/fill parameters during image resize, when they…
rINP16589: Fixes INP-1707 - Unset "Proxy" header for Web Requests
rINP16588: Fixes INP-1706 - Generate assets during deployment
rINP16587: Fixes INP-1705 - Make "Session::NeedQueryString" method always return "false"…
rINP16586: Fixes INP-1704 - Use strict comparison in "Session::NeedQueryString" method
rINP16585: Fixes INP-1703 - Set default expiration for font assets
rINP16584: Fixes INP-1700 - Translate invalid username phrase
rINP16583: Fixes INP-1699 - Don't cache language/theme while in temp mode
rINP16577: Fixes INP-1697 - Automate usage of "allow_html" block parameter
rINP16576: Fixes INP-1696 - Automatically generate value for missing "max_size" field…
rINP16575: Fixes INP-1701 - Enable client-side file size checks in Plupload
rINP16574: Fixes INP-1695 - Automatically generate value for missing "upload_dir" field…
rINP16573: Fixes INP-1694 - Upgrade YUICompressor to v2.4.8
rINP16572: Fixes INP-1693 - Show all performed actions during deployment in…
rINP16571: Fixes INP-1691 - Return user_id, when "Remember Login" is used in "UserHelper…
rINP16570: Fixes INP-1689 - Use clever scrolling when editing is done in "Same Window" mode
rINP16569: Fixes INP-1688 - Support both "%s" and "{param_name}" in validation error…
rINP16568: Fixes INP-1686 - Don't include timestamp in compiled Admin Skin file
rINP16567: Fixes INP-1685 - Handle date fields during CSV import
rINP16566: Fixes INP-1684 - Ignore hidden columns during grid column width saving
rINP16565: Fixes INP-1682 - Make "kFormatter::TypeCast" to return "false" when value (not…
rINP16564: Fixes INP-1670 - Check for empty/null value in "UserHelper…
rINP16563: Fixes INP-1666 - Move "EDITING_MODE" constant definition to "adm:OnStartup"…
rINP16561: Fixes INP-1665 - Add/use "kApplication::permissionCheckingDisabled" method
rINP16560: Fixes INP-1664 - Redirect to Canonical URL, when page is accessed via Short URL
rINP16559: Fixes INP-1661 - Check "CategoryHelper::getCategoryModule" method call result…
rINP16558: Fixes INP-1659 - Add HTML5 runtime to Plupload options
rINP16557: Fixes INP-1658 - Don't trigger clicks inside click event handler of CMS…
rINP16556: Fixes INP-1656 - Emulate SVG file resize in "ImageHelper"
rINP16555: Fixes INP-1655 - Improve "additional_title_render_as" parameter support in…
rINP16554: Fixes INP-1590 - Add sub-item support to "AdminEditButton" tag
rINP16553: Fixes INP-1586 - Automatically update "ThemeId" field of category, when it's…
rINP16552: Fixes INP-1712 - Trigger "change" event, when checkbox value is changed by…
rINP16551: Fixes INP-1680 - Restore behavior of "Select All" checkbox in…
Branches
Unknown
Tags
Unknown
Build Status
Buildable 812
Build 812: After New Commit (Harbormaster Build Plan)

Changes (72)

PathPackages
M(dir)in-portal/branches/5.3.x/
Min-portal/branches/5.3.x/.htaccess
Min-portal/branches/5.3.x/core/admin_templates/categories/categories_edit.tpl
Min-portal/branches/5.3.x/core/admin_templates/config/config_search.tpl
Min-portal/branches/5.3.x/core/admin_templates/config/config_universal.tpl
Min-portal/branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl
Min-portal/branches/5.3.x/core/admin_templates/forms/forms_edit.tpl
Min-portal/branches/5.3.x/core/admin_templates/groups/groups_edit_permissions.tpl
Min-portal/branches/5.3.x/core/admin_templates/incs/footer.tpl
Min-portal/branches/5.3.x/core/admin_templates/incs/form_blocks.tpl
Min-portal/branches/5.3.x/core/admin_templates/incs/style_template.css
Min-portal/branches/5.3.x/core/admin_templates/js/forms.js
Min-portal/branches/5.3.x/core/admin_templates/js/grid_filters.js
Min-portal/branches/5.3.x/core/admin_templates/js/template_manager.js
Min-portal/branches/5.3.x/core/admin_templates/js/uploader/plupload.dev.js
Min-portal/branches/5.3.x/core/admin_templates/js/uploader/uploader.js
Min-portal/branches/5.3.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
Min-portal/branches/5.3.x/core/admin_templates/popups/translator.tpl
Min-portal/branches/5.3.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
Min-portal/branches/5.3.x/core/admin_templates/regional/email_template_edit.tpl
Min-portal/branches/5.3.x/core/admin_templates/regional/languages_edit.tpl
Min-portal/branches/5.3.x/core/admin_templates/tools/system_tools.tpl
Min-portal/branches/5.3.x/core/install/english.lang
Min-portal/branches/5.3.x/core/install/install_data.sql
Min-portal/branches/5.3.x/core/install/upgrades.css
Min-portal/branches/5.3.x/core/install/upgrades.sql
Min-portal/branches/5.3.x/core/kernel/application.php
Min-portal/branches/5.3.x/core/kernel/db/cat_event_handler.php
Min-portal/branches/5.3.x/core/kernel/db/db_event_handler.php
Min-portal/branches/5.3.x/core/kernel/db/db_tag_processor.php
Min-portal/branches/5.3.x/core/kernel/managers/request_manager.php
Min-portal/branches/5.3.x/core/kernel/processors/main_processor.php
Min-portal/branches/5.3.x/core/kernel/session/session.php
Min-portal/branches/5.3.x/core/kernel/utility/formatters/date_formatter.php
Min-portal/branches/5.3.x/core/kernel/utility/formatters/formatter.php
Min-portal/branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php
Min-portal/branches/5.3.x/core/kernel/utility/http_query.php
Min-portal/branches/5.3.x/core/kernel/utility/validator.php
Min-portal/branches/5.3.x/core/units/admin/admin_events_handler.php
Min-portal/branches/5.3.x/core/units/categories/categories_config.php
Min-portal/branches/5.3.x/core/units/categories/categories_event_handler.php
Min-portal/branches/5.3.x/core/units/content/content_tp.php
Min-portal/branches/5.3.x/core/units/email_templates/email_template_eh.php
Min-portal/branches/5.3.x/core/units/email_templates/email_templates_config.php
Min-portal/branches/5.3.x/core/units/forms/forms/forms_config.php
Min-portal/branches/5.3.x/core/units/forms/submission_log/submission_log_config.php
Min-portal/branches/5.3.x/core/units/general/MainRouter.php
Min-portal/branches/5.3.x/core/units/groups/groups_config.php
Min-portal/branches/5.3.x/core/units/helpers/category_helper.php
Min-portal/branches/5.3.x/core/units/helpers/col_picker_helper.php
Min-portal/branches/5.3.x/core/units/helpers/csv_helper.php
Min-portal/branches/5.3.x/core/units/helpers/deployment_helper.php
Min-portal/branches/5.3.x/core/units/helpers/image_helper.php
Min-portal/branches/5.3.x/core/units/helpers/mailing_list_helper.php
Min-portal/branches/5.3.x/core/units/helpers/minifiers/minify_helper.php
Din-portal/branches/5.3.x/core/units/helpers/minifiers/yuicompressor-2.4.2.jar
Pin-portal/branches/5.3.x/core/units/helpers/minifiers/yuicompressor-2.4.8.jar
Copied from in-portal/branches/5.2.x/core/units/helpers/minifiers/yuicompressor-2.4.8.jar
Min-portal/branches/5.3.x/core/units/helpers/navigation_bar.php
Min-portal/branches/5.3.x/core/units/helpers/permissions_helper.php
Min-portal/branches/5.3.x/core/units/helpers/skin_helper.php
Min-portal/branches/5.3.x/core/units/helpers/themes_helper.php
Min-portal/branches/5.3.x/core/units/helpers/upload_helper.php
Min-portal/branches/5.3.x/core/units/helpers/user_helper.php
Min-portal/branches/5.3.x/core/units/languages/languages_config.php
Min-portal/branches/5.3.x/core/units/languages/languages_item.php
Min-portal/branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php
Min-portal/branches/5.3.x/core/units/mailing_lists/mailing_lists_config.php
Min-portal/branches/5.3.x/core/units/phrases/phrases_config.php
Min-portal/branches/5.3.x/core/units/reviews/reviews_config.php
Min-portal/branches/5.3.x/core/units/themes/theme_item.php
Min-portal/branches/5.3.x/core/units/themes/themes_config.php
Min-portal/branches/5.3.x/core/units/users/users_config.php

rINP16600

View Options

in-portal/branches/5.3.x/

Loading...
View Options

in-portal/branches/5.3.x/.htaccess

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/categories/categories_edit.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/config/config_search.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/config/config_universal.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/forms/forms_edit.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/groups/groups_edit_permissions.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/incs/footer.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/incs/form_blocks.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/incs/style_template.css

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/js/forms.js

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/js/grid_filters.js

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/js/template_manager.js

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/js/uploader/plupload.dev.js

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/js/uploader/uploader.js

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/popups/translator.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/promo_blocks/promo_block_edit.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/regional/email_template_edit.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/regional/languages_edit.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/admin_templates/tools/system_tools.tpl

Loading...
View Options

in-portal/branches/5.3.x/core/install/english.lang

Loading...
View Options

in-portal/branches/5.3.x/core/install/install_data.sql

Loading...
View Options

in-portal/branches/5.3.x/core/install/upgrades.css

Loading...
View Options

in-portal/branches/5.3.x/core/install/upgrades.sql

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/application.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/db/cat_event_handler.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/db/db_event_handler.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/db/db_tag_processor.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/managers/request_manager.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/processors/main_processor.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/session/session.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/utility/formatters/date_formatter.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/utility/formatters/formatter.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/utility/http_query.php

Loading...
View Options

in-portal/branches/5.3.x/core/kernel/utility/validator.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/admin/admin_events_handler.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/categories/categories_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/categories/categories_event_handler.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/content/content_tp.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/email_templates/email_template_eh.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/email_templates/email_templates_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/forms/forms/forms_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/forms/submission_log/submission_log_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/general/MainRouter.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/groups/groups_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/category_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/col_picker_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/csv_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/deployment_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/image_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/mailing_list_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/minifiers/minify_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/minifiers/yuicompressor-2.4.2.jar

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/minifiers/yuicompressor-2.4.8.jar

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/navigation_bar.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/permissions_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/skin_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/themes_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/upload_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/helpers/user_helper.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/languages/languages_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/languages/languages_item.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/mailing_lists/mailing_lists_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/phrases/phrases_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/reviews/reviews_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/themes/theme_item.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/themes/themes_config.php

Loading...
View Options

in-portal/branches/5.3.x/core/units/users/users_config.php

Loading...
In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server