branches

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

Fixes INP-1577 - CS fix all variable type comment

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

    • -23
    • +24
    ./5.2.x/core/kernel/db/cat_tag_processor.php
    • -1
    • +1
    ./5.2.x/core/install/upgrade_helper.php
    • -1
    • +1
    ./5.2.x/core/units/helpers/list_helper.php
    • -9
    • +9
    ./5.2.x/core/kernel/managers/request_manager.php
    • -4
    • +4
    ./5.2.x/core/units/filters/item_filter_eh.php
  1. … 163 more files in changeset.

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
    • -2
    • +10
    ./5.3.x/core/kernel/utility/email.php
    • -2
    • +16
    ./5.3.x/core/units/users/users_event_handler.php
    • -47
    • +23
    ./5.3.x/core/ckeditor/plugins/my_link/plugin.js
    • -0
    • +1
    ./5.3.x/core/install/install_schema.sql
    • -6
    • +15
    ./5.3.x/core/kernel/utility/logger.php
    • -8
    • +11
    ./5.3.x/core/units/helpers/deployment_helper.php
  1. … 24 more files in changeset.

Fixes INP-1642 - Allow "kColumnPickerHelper" class to correctly reorder/resize multilingual columns

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

    • -2
    • +2
    ./5.2.x/core/units/helpers/col_picker_helper.php

Fixes INP-1641 - PHP 7 compatibility issues (5.2.x)

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

Fixes INP-1640 - Use "current" function only on arrays in "kDBConnectionDebug::GetIterator" method

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

    • -1
    • +13
    ./5.2.x/core/kernel/db/db_connection.php

Fixes INP-1630 - Actualize link injection code in "my_link" plugin of CKEditor

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

    • -47
    • +23
    ./5.2.x/core/ckeditor/plugins/my_link/plugin.js

Fixes INP-1595 - Allow uploading Microsoft Office 2007+ generated files in CKFinder

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

    • -2
    • +2
    ./5.2.x/core/ckeditor/ckfinder/config.php

Fixes INP-1594 - Generate/check category filename after page protection code was executed

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

Fixes INP-1593 - Auto-detect format of provided password in "kPasswordFormatter::hashPassword" method for migrated users

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

Fixes INP-1591 - Explicitly set 0px top margin for Modal Window iframes

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

Fixes INP-1588 - Don't propagate "click" event on orange "Edit Content" buttons

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

Fixes INP-1587 - Change stylesheet URL for CKEditor to immediately return CSS

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

    • -0
    • +6
    ./5.2.x/core/units/helpers/fck_helper.php

Fixes INP-1585 - Take value of "style" parameter of "inp_edit_multioptions" block into account

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

Fixes INP-1582 - Disable "codemirror" CKEditor add-on during inline Content Block editing

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

    • -1
    • +1
    ./5.2.x/core/units/helpers/fck_helper.php

Fixes INP-1581 - Load email sender/recipient from live table

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

    • -2
    • +10
    ./5.2.x/core/kernel/utility/email.php

Fixes INP-1580 - Set current user ID to current frame for Change Password dialog

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

Fixes INP-1578 - Don't remove "/system/cache/.gitignore" when clearing cache

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

Fixes INP-1572 - Change semaphores to allow concurrent editing of different DB records

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

    • -12
    • +41
    ./5.2.x/core/kernel/utility/temp_handler.php
    • -0
    • +1
    ./5.2.x/core/install/install_schema.sql

Fixes INP-1564 - Check duplicate SQL revisions across all defined revisions

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

    • -9
    • +12
    ./5.2.x/core/units/helpers/deployment_helper.php

Fixes INP-1562 - Don't overwrite template parameter value in <inp2:m_Param/> tag

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

    • -16
    • +21
    ./5.2.x/core/kernel/nparser/ntags.php

Fixes INP-1551 - Add the "kDBList::GetSelectedCount" method and "SelectedRecords" tag using it

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

Fixes INP-1527 - User's profile update via AJAX support

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

    • -2
    • +16
    ./5.2.x/core/units/users/users_event_handler.php

Fixes INP-1513 - Fix word wrapping in "inp_edit_checkboxes" form control

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

Fixes INP-1502 - Gracefully handle case of missing file/line keys in stack trace info

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

    • -6
    • +15
    ./5.2.x/core/kernel/utility/logger.php

Fixes INP-1486 - Don't give up, when single item update fails in "iterateItems" method

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

Fixes INP-1447 - Remove usage of 'name' parameter in "kDBTagProcessor::GetList" method

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

Merge of "in-portal/branches/5.2.x@16439" to "in-portal/branches/5.3.x@16429".

[backported] Fixes INP-1631 - Use "array_replace_recursive" inside kSystemConfig class

[backported] Fixes INP-1632 - Use "path" in from DBG_EDITOR_URL constant only when available

    • -1
    • +5
    ./5.2.x/core/kernel/utility/debugger.php

[backported] Fixes INP-1633 - Optimize unit config search

Conflicts:

  • core/kernel/utility/unit_config_reader.php