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

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

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

  1. … 1 more file in changeset.

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

  1. … 40 more files in changeset.

Fixes INP-1331 - Integrate Plupload

    • -0
    • +2254
    ./uploader/plupload.dev.js
    • -0
    • +10211
    ./uploader/moxie.js
  1. … 7 more files in changeset.

Fixes INP-1290 - Deal with "svn:ignore" attributes

  1. … 10 more files in changeset.

Fixes INP-1251 - Add support for using jQueryUI Autocomplete

    • -4
    • +4
    ./jquery/jquery-ui-1.10.3.custom.min.js
    • binary
    ./jquery/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
    • binary
    ./jquery/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
    • -0
    • +624
    ./jquery/ui-lightness/jquery-ui-1.10.3.custom.css
    • binary
    ./jquery/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  1. … 14 more files in changeset.

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

  1. … 72 more files in changeset.

Fixes INP-1318 - Add support for multi-select to AjaxDropdownPreloader control

Fixes INP-1309 - Implement inline editing

  1. … 17 more files in changeset.

Fixes INP-1303 - Disable content revision toolbar related js code when toolbar is disabled

Fixes INP-1300 - Upgrade to CKEditor 4.2

  1. … 759 more files in changeset.

Merge of "in-portal/branches/5.2.x@15906" to "in-portal/branches/5.3.x@15902".

  1. … 16 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
    • +6
    ./jquery/jquery-ui-1.10.3.custom.min.js
  1. … 138 more files in changeset.

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

Commit on behalf of Erik

  1. … 34 more files in changeset.

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

  1. … 187 more files in changeset.

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

  1. … 2409 more files in changeset.