Could not resolve revision 2853

composer.lock

Checkout
Diff latest
Open in IDE
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
9 revisions

Merging from 5.2.x to 5.3.x

Conflicts:

  • composer.json
  • composer.lock
  • core/install/prerequisites.php
  • core/install/step_templates/sys_requirements.tpl
  • core/install/steps_db.xml
  • core/kernel/application.php
  • core/units/helpers/cron_helper.php

Merging from 5.2.x to 5.3.x

Conflicts:

  • composer.json
  • composer.lock
  • core/install/prerequisites.php
  • core/install/step_templates/sys_requirements.tpl
  • core/install/steps_db.xml
  • core/kernel/application.php
  • core/units/helpers/cron_helper.php
Revision ID:
16800
Parents:
branches/5.3.x/composer.lock 16723
Head on:
5.3.x

Merge of "in-portal/branches/5.2.x@16691" to "in-portal/branches/5.3.x@16718".

Conflicts:

  • composer.json
  • composer.lock
  • core/kernel/application.php

Merge of "in-portal/branches/5.2.x@16691" to "in-portal/branches/5.3.x@16718".

Conflicts:

  • composer.json
  • composer.lock
  • core/kernel/application.php
Revision ID:
16723
Parents:
branches/5.3.x/composer.lock 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

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
Revision ID:
16395
Parents:
branches/5.3.x/composer.lock 16284

Fixes INP-1484 - Connect "Symfony Process" component

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

Fixes INP-1484 - Connect "Symfony Process" component

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

Revision ID:
16284
Parents:
branches/5.3.x/composer.lock 16195

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

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

Revision ID:
16195
Parents:
branches/5.3.x/composer.lock 16181

Fixes INP-1421 - Integrate Symfony Console Component

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

Fixes INP-1421 - Integrate Symfony Console Component

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

Revision ID:
16181
Parents:
branches/5.3.x/composer.lock 16156

Fixes INP-1422 - Store class map on disk

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

Fixes INP-1422 - Store class map on disk

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

Revision ID:
16156
Parents:
branches/5.3.x/composer.lock 16124

Merge of "in-portal/branches/5.2.x@16121" to "in-portal/branches/5.3.x@16111".

Merge of "in-portal/branches/5.2.x@16121" to "in-portal/branches/5.3.x@16111".

Revision ID:
16124
Parents:
branches/5.2.x/composer.lock 16117

Fixes INP-1394 - Enable Composer Support

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

Fixes INP-1394 - Enable Composer Support

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

Revision ID:
16117
Branch points:
5.3.x