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

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

1. restored changes, that were lost during inaccurate merge conflict resolution

2. other changes were already restored in: 15680, 15902, 16323

    • -1
    • +1
    ./system_presets/simple/email_templates_email-template.php
  1. … 8 more files in changeset.

Fixes INP-1515 - Allow to enable/disable the Site Domain

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

    • -4
    • +4
    ./system_presets/simple/site_domains_site-domain.php
  1. … 7 more files in changeset.

Fixes INP-1505 - Restore e-mail template translation sync code removed during merge

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

    • -4
    • +8
    ./system_presets/simple/email_templates_email-template.php
  1. … 4 more files in changeset.

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

  1. … 85 more files in changeset.

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

    • -3
    • +3
    ./system_presets/simple/site_domains_site-domain.php
  1. … 20 more files in changeset.

Fixes INP-1309 - Implement inline editing

    • -1
    • +20
    ./system_presets/simple/inp_ckconfig.js
  1. … 18 more files in changeset.

Fixes INP-1300 - Upgrade to CKEditor 4.2

    • -24
    • +26
    ./system_presets/simple/inp_ckconfig.js
  1. … 759 more files in changeset.

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

    • -0
    • +54
    ./system_presets/simple/system_logs_system-log.php
    • -3
    • +3
    ./system_presets/simple/site_domains_site-domain.php
  1. … 149 more files in changeset.

Creating '.gitignore' files to preserve empty folders during Git migration

    • -0
    • +0
    ./system_presets/advanced/.gitignore
    • -0
    • +0
    ./system_presets/custom/.gitignore
  1. … 6 more files in changeset.

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

    • -3
    • +3
    ./system_presets/simple/email_logs_email-log.php
    • -5
    • +5
    ./system_presets/simple/system_event_subscriptions_system-event-subscription.php
    • -1
    • +1
    ./system_presets/simple/languages_lang.php
    • -68
    • +0
    ./system_presets/simple/email_events_emailevents.php
    • -0
    • +64
    ./system_presets/simple/email_templates_email-template.php
  1. … 186 more files in changeset.

Bug #0001023: Ability to Keep Language Packs in Sync

INP-825

    • -3
    • +7
    ./system_presets/simple/email_events_emailevents.php
  1. … 32 more files in changeset.

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

    • -0
    • +49
    ./system_presets/simple/user_groups_u-ug.php
    • -0
    • +44
    ./system_presets/simple/translator_trans.php
    • -0
    • +45
    ./system_presets/simple/files_file.php
    • -0
    • +6
    ./system_presets/simple/files_l-file.php
    • -0
    • +50
    ./system_presets/simple/email_logs_email-log.php
    • -0
    • +51
    ./system_presets/simple/session_logs_session-log.php
    • -0
    • +20
    ./system_presets/simple/sections_core-sections.php
    • -0
    • +49
    ./system_presets/simple/user_groups_g-ug.php
    • -0
    • +48
    ./system_presets/simple/relationship_rel.php
  1. … 2409 more files in changeset.