Fisheye: Diff - In-Portal/branches/5.3.x/INSTALL

Tree
Options

branches
- 5.0.x
- 5.1.x
- 5.2.x
- 5.3.x
- RC
- unlabeled
releases
- 5.0.0
- 5.0.1
- 5.0.2
- 5.0.2-B1
- 5.0.2-B2
- 5.0.2-RC1
- 5.0.3
- 5.0.3-B1
- 5.0.3-B2
- 5.0.3-RC1
- 5.0.4
- 5.0.4-B1
- 5.0.4-B2
- 5.1.0
- 5.1.0-B1
- 5.1.0-B2
- 5.1.0-RC1
- 5.1.1
- 5.1.1-B1
- 5.1.1-B2
- 5.1.1-RC1
- 5.1.2
- 5.1.2-B1
- 5.1.2-B2
- 5.1.2-RC1
- 5.1.3
- 5.1.3-B1
- 5.1.3-B2
- 5.1.3-RC1
- 5.1.3-RC2
- 5.2.0
- 5.2.0-B1
- 5.2.0-B2
- 5.2.0-B3
- 5.2.0-RC1
- 5.2.1
- 5.2.1-B1
- 5.2.1-B2
  - tools
  - system
  - themes
  - admin
    - system_presets
    - File index.php
  - core
  - modules
  - File .htaccess
  - File COPYRIGHT
  - File CREDITS
  - File INSTALL
  - File LICENSE
  - File LICENSES
  - File README
  - File favicon.ico
  - File index.php
  - File robots.txt
- 5.2.1-RC1
- 5.2.2-B1
- 5.2.2-B2
- RC_apr06_1
- RC_apr07_1
- RC_aug06_1
- RC_aug07_1
- RC_aug08_1
- RC_feb07_1
- RC_feb08_1
- RC_jan08_1
- RC_jul06_1
- RC_jul07_1
- RC_jul07_2
- RC_mar07_1
- RC_mar08_1
- RC_mar08_2
- RC_may06_1
- RC_may07_1
- RC_may07_2
- RC_may07_3
- RC_nov06_1
- RC_oct08_1
- RC_sep06_1
- release_1_0_10
- release_1_0_11
- release_1_0_12
- release_1_0_3
- release_1_0_4
- release_1_0_5
- release_1_0_6
- release_1_0_7
- release_1_0_8
- release_1_0_9
- release_1_1_0
- release_1_1_1
- release_1_1_2
- release_1_1_3
- release_1_1_4
- release_1_1_5
- release_1_1_6
- release_1_1_7
- release_1_1_8
- release_1_2_0
- release_1_2_1
- release_1_3_0
- release_1_3_1
- release_1_4_0
- release_4_0_1
- release_4_1_0
- release_4_2_0
- release_4_2_1
- release_4_2_2
- release_4_3_0
- release_4_3_1
- release_4_3_9
- release_5_0_0
tags
trunk

16395

Merge of "in-portal/branches/5.2.x@16388" to "in-portal/branches/5.3.x@16391".

Conflicts:

composer.lock
core/admin_templates/catalog/advanced_view.tpl
core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
core/admin_templates/config/config_edit.tpl
core/admin_templates/incs/form_blocks.tpl
core/admin_templates/incs/grid_blocks.tpl
core/admin_templates/js/ajax_dropdown.js
core/admin_templates/js/template_manager.js
core/admin_templates/mailing_lists/send_queue.tpl
core/admin_templates/reviews/reviews.tpl
core/admin_templates/users/user_edit_items.tpl
core/install/english.lang
core/install/install_data.sql
core/install/install_toolkit.php
core/install/upgrades.php
core/install/upgrades.sql
core/kernel/application.php
core/kernel/db/cat_event_handler.php
core/kernel/db/db_event_handler.php
core/kernel/db/db_tag_processor.php
core/kernel/kbase.php
core/kernel/managers/url_manager.php
core/kernel/nparser/nparser_config.php
core/kernel/session/session.php
core/kernel/utility/event.php
core/kernel/utility/factory.php
core/kernel/utility/http_query.php
core/kernel/utility/unit_config_reader.php
core/units/admin/admin_config.php
core/units/admin/admin_tag_processor.php
core/units/categories/categories_config.php
core/units/categories/categories_event_handler.php
core/units/category_items/category_items_config.php
core/units/email_queue/email_queue_config.php
core/units/forms/form_fields/form_fields_config.php
core/units/forms/form_submissions/form_submissions_config.php
core/units/forms/forms/forms_config.php
core/units/general/general_config.php
core/units/helpers/image_helper.php
core/units/helpers/language_import_helper.php
core/units/helpers/modules_helper.php
core/units/images/images_config.php
core/units/logs/change_logs/change_logs_config.php
core/units/logs/email_logs/email_logs_config.php
core/units/logs/session_logs/session_logs_config.php
core/units/mailing_lists/mailing_lists_config.php
core/units/modules/modules_config.php
core/units/page_revisions/page_revisions_config.php
core/units/permissions/permissions_event_handler.php
core/units/permissions/permissions_tag_processor.php
core/units/phrases/phrases_config.php
core/units/reviews/reviews_config.php
core/units/scheduled_tasks/scheduled_task_eh.php
core/units/scheduled_tasks/scheduled_tasks_config.php
core/units/sections/sections_config.php
core/units/site_domains/site_domains_config.php
core/units/structure/structure_config.php
core/units/themes/themes_config.php
core/units/user_groups/user_groups_config.php
core/units/users/users_config.php

12 Nov 16 Alex 16395

16195

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

19 May 15 Alex 16195

Loading ...