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

Merge of "in-portal/branches/5.2.x@16544" to "in-portal/branches/5.3.x@16534".

Conflicts:

  • core/install/install_data.sql
  • core/install/upgrades.sql
  1. … 4 more files in changeset.

Fixes INP-1532 - Allow specifying scheduled time for Promo Blocks

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

  1. … 3 more files in changeset.

Merge of "in-portal/branches/5.2.x@16513" to "in-portal/branches/5.3.x@16503".

Conflicts:

  • core/install.php
  • core/install/install_toolkit.php
  • core/kernel/application.php
  • core/kernel/db/cat_event_handler.php
  • core/kernel/db/cat_tag_processor.php
  • core/kernel/db/db_event_handler.php
  • core/kernel/db/db_tag_processor.php
  • core/kernel/db/dblist.php
  • core/kernel/kbase.php
  • core/kernel/managers/plain_url_processor.php
  • core/kernel/managers/rewrite_url_processor.php
  • core/kernel/processors/main_processor.php
  • core/kernel/session/session.php
  • core/kernel/utility/event.php
  • core/kernel/utility/formatters/multilang_formatter.php
  • core/kernel/utility/temp_handler.php
  • core/units/categories/categories_event_handler.php
  • core/units/categories/categories_tag_processor.php
  • core/units/custom_fields/custom_fields_event_handler.php
  • core/units/email_templates/email_template_eh.php
  • core/units/email_templates/email_template_tp.php
  • core/units/favorites/favorites_eh.php
  • core/units/forms/form_submissions/form_submissions_eh.php
  • core/units/forms/submission_log/submission_log_eh.php
  • core/units/helpers/cat_dbitem_export_helper.php
  • core/units/helpers/csv_helper.php
  • core/units/helpers/mod_rewrite_helper.php
  • core/units/helpers/sections_helper.php
  • core/units/helpers/themes_helper.php
  • core/units/logs/session_logs/session_log_eh.php
  • core/units/mailing_lists/mailing_list_eh.php
  • core/units/modules/modules_event_handler.php
  • core/units/modules/modules_tag_processor.php
  • core/units/page_revisions/page_revision_eh.php
  • core/units/priorites/priority_eh.php
  • core/units/scheduled_tasks/scheduled_task_eh.php
  • core/units/site_domains/site_domain_eh.php
  • core/units/statistics/statistics_tag_processor.php
  • core/units/user_groups/user_groups_eh.php
  • core/units/users/users_event_handler.php
  1. … 177 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
  1. … 35 more files in changeset.

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
  1. … 107 more files in changeset.

Fixes INP-1510 - Allow rotation of "Session Log" and "Changes Log"

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

  1. … 2 more files in changeset.

Fixes INP-1515 - Allow to enable/disable the Site Domain

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

  1. … 6 more files in changeset.

Fixes INP-1500 - Remove excessing <%TABLE_PREFIX%> usages in "upgrades.sql" file

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

Fixes INP-1501 - Replace "emailevents" with "email-template" in 5.3.x upgrade script

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

Fixes INP-1523 - Populate user info, when sending membership expiration e-mails

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

  1. … 1 more file in changeset.

Fixes INP-1484 - Connect "Symfony Process" component

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

  1. … 3 more files in changeset.

Fixes INP-1485 - Create "AbstractCommand::initDependencies" method

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

  1. … 4 more files in changeset.

Fixes INP-1482 - Add "ConsoleIO" class

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

  1. … 6 more files in changeset.

Fixes INP-1481 - Add missing "svn:keywords" properties to PHP files (5.3.x)

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

  1. … 179 more files in changeset.

Fixes INP-1436 - PHP 7 compatibility issues

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

  1. … 6 more files in changeset.

Fixes INP-1459 - Remove "Intechnic\" from namespace

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

  1. … 15 more files in changeset.

Fixes INP-1435 - Add Console command for running Scheduled Tasks

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

  1. … 5 more files in changeset.

Fixes INP-1421 - Integrate Symfony Console Component

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

  1. … 22 more files in changeset.

Fixes INP-1424 - Don't call "refreshModuleInfo" twice in a row

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

Fixes INP-1079 - Routing Ideas

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

  1. … 18 more files in changeset.

Fixes INP-1429 - Class hierarchy analyzer

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

  1. … 5 more files in changeset.

Fixes INP-1422 - Store class map on disk

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

    • -0
    • +341
    ./cache/class_structure.php
  1. … 27 more files in changeset.

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

  1. … 31 more files in changeset.

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

  1. … 85 more files in changeset.

Fixes INP-1316 - Add primary key to table, that don't have it

1. fixed changing user's primary group from user editing page

  1. … 1 more file in changeset.

Fixes INP-1328 - Unify BaseURL method logic for ssl and non-ssl urls

  1. … 15 more files in changeset.

Fixes INP-1316 - Add primary key to table, that don't have it

  1. … 11 more files in changeset.

Fixes INP-1324 - Enable mod-rewrite for new installations

Commit on behalf of Erik

Fixes INP-1319 - Subscriber e-mail missing in Admin notifications

Fixes INP-1159 - Create intermediate class to access /system/config.php file

  1. … 11 more files in changeset.