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

Merge of "in-portal/branches/5.2.x@16484" to "in-portal/branches/5.3.x@16440".

Merge of "in-portal/releases/5.2.2-B1@16502" to "in-portal/branches/5.3.x@16440".

Conflicts:

  • .
  • core/install/install_data.sql
  • core/install/upgrades.css
  • core/install/upgrades.sql
  • core/kernel/managers/rewrite_url_processor.php
  • core/kernel/utility/temp_handler.php
  • core/kernel/utility/unit_config_reader.php
  • core/units/helpers/deployment_helper.php
  1. … 38 more files in changeset.

Fixes INP-1539 - Make styleSet name configurable in FCKEditor tag

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

Fixes INP-1416 - Can't edit content block when no stylesheet file defined in the current theme

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

Fixes INP-1445 - Inline CKEditor styles aren't working

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

Merge of "in-portal/branches/5.2.x@16121" to "in-portal/branches/5.3.x@16111".

  1. … 37 more files in changeset.

Fixes INP-1328 - Unify BaseURL method logic for ssl and non-ssl urls

  1. … 20 more files in changeset.

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

  1. … 73 more files in changeset.

Fixes INP-1309 - Implement inline editing

  1. … 18 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. … 2423 more files in changeset.