users_config.php

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

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

Merge of "in-portal/branches/5.2.x@16189" to "in-portal/branches/5.3.x@16188".

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".

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

Fixes #0001399: Remove "ItemSQLs" from unit configs

INP-1156

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