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

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. … 71 more files in changeset.

Fixes INP-1532 - Allow specifying scheduled time for Promo Blocks

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

  1. … 4 more files in changeset.

Fixes INP-1298 - Use "http_build_query" to escape url parameters

  1. … 73 more files in changeset.

Fixes INP-1174: Using CodeMirror on SQL Query page in Admin

Commit on behalf of Erik

  1. … 35 more files in changeset.

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

  1. … 191 more files in changeset.

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

  1. … 2421 more files in changeset.