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

Fixes INP-1791 - Add "picker" control type for configuration settings

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

  1. … 3 more files in changeset.

Merge of "in-portal/branches/5.2.x@16599" to "in-portal/branches/5.3.x@16597".

Conflicts:

  • core/admin_templates/categories/categories_edit.tpl
  • core/admin_templates/forms/form_edit_emails.tpl
  • core/admin_templates/forms/forms_edit.tpl
  • core/admin_templates/incs/form_blocks.tpl
  • core/admin_templates/languages/email_template_edit.tpl
  • core/admin_templates/mailing_lists/mailing_list_edit.tpl
  • core/admin_templates/popups/translator.tpl
  • core/admin_templates/promo_blocks/promo_block_edit.tpl
  • core/admin_templates/regional/email_template_edit.tpl
  • core/admin_templates/regional/languages_edit.tpl
  • core/install/english.lang
  • core/install/install_data.sql
  • core/install/upgrades.css
  • core/install/upgrades.sql
  • core/kernel/constants.php
  • core/kernel/utility/email.php
  • core/kernel/utility/formatters/date_formatter.php
  • core/units/categories/categories_event_handler.php
  • core/units/email_queue/email_queue_eh.php
  • core/units/email_templates/email_template_eh.php
  • core/units/helpers/csv_helper.php
  • core/units/helpers/deployment_helper.php
  • core/units/helpers/mailing_list_helper.php
  • core/units/helpers/skin_helper.php
  • core/units/mailing_lists/mailing_list_eh.php
  1. … 69 more files in changeset.

Fixes INP-1473 - Add "edit_field" parameter to "AdminEditButton" tag

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

  1. … 2 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. … 37 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-1549 - The "grid_like_combo_filter" doesn't trigger search on ENTER press (the jQueryUI.Autocomplete)

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

Fixes INP-1511 - Presets for category items export

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

Fixes INP-1331 - Integrate Plupload

  1. … 10 more files in changeset.

Fixes INP-1251 - Add support for using jQueryUI Autocomplete

  1. … 26 more files in changeset.

Fixes INP-1298 - Use "http_build_query" to escape url parameters

  1. … 69 more files in changeset.

Fixes INP-1309 - Implement inline editing

  1. … 18 more files in changeset.

Fixes INP-1174 - Using CodeMirror on SQL Query page in Admin

1. upgraded CodeMirror to 3.14

2. added "Active Line" addon

3. added highlighting to skin editing

    • -252
    • +393
    ./code_mirror/mode/css/css.js
    • -14
    • +22
    ./code_mirror/lib/codemirror.css
    • -23
    • +43
    ./code_mirror/mode/htmlmixed/htmlmixed.js
    • -0
    • +39
    ./code_mirror/addon/selection/active-line.js
    • -0
    • +349
    ./code_mirror/mode/sql/sql.js
    • -203
    • +0
    ./code_mirror/mode/mysql/mysql.js
    • -17
    • +76
    ./code_mirror/mode/clike/clike.js
    • -1350
    • +2279
    ./code_mirror/lib/codemirror.js
  1. … 5 more files in changeset.

Fixes INP-1300 - Upgrade to CKEditor 4.2

  1. … 758 more files in changeset.

Merge of "in-portal/releases/5.2.1-B2@15839" to "in-portal/branches/5.3.x@15852".

Merge of "in-portal/releases/5.2.1-RC1@15881" to "in-portal/branches/5.3.x@15852".

  1. … 146 more files in changeset.

Fixes INP-1174: Using CodeMirror on SQL Query page in Admin

Commit on behalf of Erik

    • -0
    • +465
    ./code_mirror/mode/css/css.js
    • -0
    • +203
    ./code_mirror/mode/mysql/mysql.js
    • -0
    • +240
    ./code_mirror/lib/codemirror.css
    • -0
    • +302
    ./code_mirror/mode/clike/clike.js
    • -0
    • +129
    ./code_mirror/mode/php/php.js
    • -0
    • +324
    ./code_mirror/mode/xml/xml.js
  1. … 21 more files in changeset.

Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.x@15659".

  1. … 188 more files in changeset.

Bug #0001023: Ability to Keep Language Packs in Sync

INP-825

  1. … 32 more files in changeset.

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

  1. … 2409 more files in changeset.