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

Merge of "in-portal/releases/5.1.3@14548" to "in-portal/branches/5.2.x@14575".

    • -1
    • +17
    ./units/users/users_event_handler.php
    • -7
    • +21
    ./admin_templates/categories/ci_blocks.tpl
    • -3
    • +3
    ./units/statistics/statistics_config.php
    • -10
    • +12
    ./units/images/image_tag_processor.php
    • -1
    • +11
    ./kernel/utility/debugger/debugger.js
  1. … 132 more files in changeset.

Bug #0001123: Parallel cache rebuild problem could cause high server load

1. fixing infinite unit config cache waiting during installation

INP-919

    • -10
    • +12
    ./kernel/utility/unit_config_reader.php

Bug #0001114: Installation fails after "Select Modules" step

1. merging from 5.1.x to 5.2.x because can't complete installation

INP-912

Bug #0001125: Prepare 5.2.0 release

1. adapting merged 5.1.2 code

INP-921

Merge of "in-portal/releases/5.1.2@14308" to "in-portal/branches/5.2.x@14560".

    • -14
    • +25
    ./kernel/session/session_storage.php
    • -2
    • +26
    ./admin_templates/regional/email_messages_edit.tpl
    • -2
    • +21
    ./units/users/users_event_handler.php
    • -2
    • +0
    ./units/structure/structure_config.php
    • -3
    • +5
    ./units/statistics/statistics_config.php
    • -11
    • +12
    ./units/images/image_tag_processor.php
    • -0
    • +25
    ./admin_templates/users/image_edit.tpl
  1. … 84 more files in changeset.

Fixes #0001123: Parallel cache rebuild problem could cause high server load

INP-919

    • -7
    • +21
    ./units/helpers/category_helper.php
    • -6
    • +13
    ./units/helpers/sections_helper.php
    • -12
    • +105
    ./kernel/managers/cache_manager.php
    • -4
    • +11
    ./kernel/utility/unit_config_reader.php
    • -3
    • +3
    ./units/site_domains/site_domain_eh.php
    • -4
    • +4
    ./units/admin/admin_events_handler.php

Bug #0001095: Error messages are displayed on unrelated forms

1. adaptation for 5.2.x code

INP-895

Bug #0001095: Error messages are displayed on unrelated forms

1. merging from 5.1.x to 5.2.x because it's needed by #0000271 task.

INP-895

    • -82
    • +56
    ./units/users/users_event_handler.php

Bug #0000951: User isn't automatically logged-in, when "Immediate" user registration mode is used

1. merging from 5.1.x to 5.2.x because it's needed by #0000271 task.

INP-765

Fixes #0001050: Ability to access Disabled Section with Direct Link

INP-851

    • -0
    • +6
    ./units/structure/structure_config.php
    • -0
    • +6
    ./units/categories/categories_config.php
  1. … 1 more file in changeset.

Bug #0001056: No way to open disabled page from Admin Console

1. merging from 5.1.x to 5.2.x because it's needed by #0001050 task.

INP-857

    • -1
    • +1
    ./units/helpers/mod_rewrite_helper.php

Fixes #0000948: Change in "Forgot Password" logic

INP-762

    • -129
    • +108
    ./units/users/users_event_handler.php
    • -77
    • +59
    ./units/users/users_tag_processor.php
  1. … 1 more file in changeset.

Bug #0001044: Expiration of registration with "Email Activation" can't be changed

1. merging from 5.1.x to 5.2.x because it's needed by #0000948 task.

INP-845

    • -12
    • +26
    ./units/users/users_tag_processor.php

Fixes #0000778: Improvements to Create User & Admin form in Admin

INP-618

    • -0
    • +70
    ./admin_templates/users/user_blocks.tpl
    • -18
    • +79
    ./units/users/users_event_handler.php
    • -2
    • +11
    ./admin_templates/users/admins_edit.tpl
    • -1
    • +0
    ./admin_templates/incs/form_blocks.tpl
    • -2
    • +10
    ./admin_templates/users/users_edit.tpl

Fixes #0000964: Improvements to user Login field

INP-778

    • -30
    • +18
    ./units/users/users_event_handler.php

Bug #0001080: Users can register without password, when automatic passwords are turned off

1. merging from 5.1.x to 5.2.x because it's needed by #0001031 task.

INP-880

Fixes #0001031: User management internals refactoring

INP-833

    • -166
    • +183
    ./units/users/users_event_handler.php
    • -1
    • +3
    ./admin_templates/users/admins_edit.tpl
    • -2
    • +2
    ./admin_templates/users/users_list.tpl
    • -6
    • +11
    ./units/user_groups/user_groups_config.php
    • -48
    • +54
    ./units/user_groups/user_groups_eh.php
  1. … 3 more files in changeset.

Bug #0001078: Unsubscribing from mailing list doesn't delete all related user data

1. merging from 5.1.x to 5.2.x because it's needed by #0001031 task.

INP-878

Bug #0000823: User primary group isn't correctly set in session after it's login

1. merging from 5.1.x to 5.2.x because it's needed by #0001031 task.

INP-658

Bug #0000941: Impossible to Subscribe to Newsletter

1. merging from 5.1.x to 5.2.x because it's needed by #0001031 task.

INP-756

Bug #0000268: Code Cleanup in 5.2.x branch

  • ability to override every system class, that is retrieved via factory (e.g. kEventManager)
  • all classes are created via kFactory class, so they can be overridden too
  • system object, like kUnitConfigReader class object are no longer stored in kFactory class
  • class registration in kApplication::RegisterDefaultClasses method rearranged into logical groups
  • design patterns, noted in class/method comments, when applicatable
  • unit config re-reading redesign by interface usage

INP-224

    • -0
    • +2
    ./units/helpers/mod_rewrite_helper.php
    • -0
    • +61
    ./kernel/managers/cache_manager.php
    • -16
    • +16
    ./kernel/utility/unit_config_reader.php

Bug #0001025: Automatically set "svn:keywords" property to PHP files

INP-827

    • -0
    • +0
    ./admin_templates/js/jquery/thickbox/thickbox.css
    • -0
    • +0
    ./units/user_profile/user_profile_tp.php
    • binary
    ./admin_templates/img/button_back.gif
    • binary
    ./admin_templates/img/toolbar/icon16_search.gif
    • -0
    • +0
    ./units/statistics/statistics_config.php
    • -0
    • +0
    ./units/images/image_tag_processor.php
  1. … 993 more files in changeset.

Bug #0000974: Several warnings from adodb time library, while used on PHP 5.3

Manual merge.

INP-787

    • -3
    • +12
    ./kernel/utility/adodb-time.inc.php

Bug #0000268: Code Cleanup in 5.2.x branch

Part 2 (see http://tracker.in-portal.org/view.php?id=268#bugnotes, bugnote 3206)

INP-224

    • -60
    • +18
    ./kernel/languages/phrases_cache.php
    • -1
    • +1
    ./units/modules/modules_event_handler.php
    • -3
    • +47
    ./units/helpers/mod_rewrite_helper.php
    • -0
    • +631
    ./kernel/managers/url_manager.php
    • -0
    • +574
    ./kernel/managers/cache_manager.php
    • -119
    • +18
    ./kernel/utility/unit_config_reader.php
    • -8
    • +11
    ./units/admin/admin_events_handler.php

Bug #0000268: Code Cleanup in 5.2.x branch

Part 1 (see http://tracker.in-portal.org/view.php?id=268#bugnotes, bugnote 2970)

Duplicate <?php tag removed

INP-224

Bug #0000268: Code Cleanup in 5.2.x branch

Part 1 (see http://tracker.in-portal.org/view.php?id=268#bugnotes, bugnote 2970)

INP-224

    • -0
    • +466
    ./kernel/session/session_storage.php
    • -0
    • +188
    ./kernel/managers/hook_manager.php
    • -32
    • +32
    ./units/users/users_event_handler.php
    • -1
    • +1
    ./units/helpers/custom_fields_helper.php
    • -6
    • +4
    ./units/images/image_tag_processor.php
    • -2
    • +2
    ./units/helpers/mailing_list_helper.php
    • -12
    • +32
    ./units/forms/forms/forms_eh.php
    • -127
    • +133
    ./kernel/utility/factory.php
    • -0
    • +10
    ./kernel/utility/debugger/debugger.js
  1. … 148 more files in changeset.

Merge of "in-portal/releases/5.1.1@14072" to "in-portal/branches/5.2.x@13841".

    • -36
    • +18
    ./admin_templates/skins/skin_edit.tpl
    • -12
    • +8
    ./admin_templates/categories/ci_blocks.tpl
    • -55
    • +33
    ./units/user_profile/user_profile_tp.php
    • -3
    • +8
    ./units/images/image_tag_processor.php
    • -1
    • +1
    ./admin_templates/users/users_list.tpl
    • -1
    • +1
    ./admin_templates/categories/categories_edit_permissions.tpl
  1. … 178 more files in changeset.

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

    • -0
    • +1521
    ./kernel/utility/debugger.php
    • -0
    • +2920
    ./kernel/db/db_event_handler.php
  1. … 1579 more files in changeset.