admin_templates

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

Fixes INP-1698 - Allow using CKEditor and CodeMirror on same textarea

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

Fixes INP-1583 - Add support for "Content Templates" inside CKEditor

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

  1. … 2 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.

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

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

    • -61
    • +2
    ./promo_blocks/promo_block_edit.tpl
  1. … 4 more files in changeset.

Fixes INP-1542 - Add "Export" button to "Show All" grid in "Website & Content > Structure & Data" section

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

  1. … 1 more file 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. … 34 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
    • -3
    • +3
    ./categories/categories_edit_permissions.tpl
  1. … 96 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. restored changes, that were lost during inaccurate merge conflict resolution

  1. … 1 more file in changeset.

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

1. restored changes, that were lost during inaccurate merge conflict resolution

2. other changes were already restored in: 15680, 15902, 16323

  1. … 8 more files in changeset.

Fixes INP-1545 - Enable SQL syntax highlight in "Tools > Query Database" section

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

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-1515 - Allow to enable/disable the Site Domain

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

    • -2
    • +30
    ./site_domains/site_domain_list.tpl
  1. … 6 more files in changeset.

Fixes INP-1505 - Restore e-mail template translation sync code removed during merge

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

    • -2
    • +44
    ./languages/email_template_edit.tpl
  1. … 4 more files in changeset.

Fixes INP-1448 - Support "pass_through" parameter in "adm:SelectorLink" tag

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

  1. … 1 more file in changeset.

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

  1. … 40 more files in changeset.

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

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

    • -12
    • +2
    ./scheduled_tasks/scheduled_task_list.tpl
  1. … 5 more files in changeset.

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

  1. … 37 more files in changeset.

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

    • -1
    • +1
    ./promo_block_groups/promo_block_group_list.tpl
    • -1
    • +1
    ./custom_fields/custom_fields_edit.tpl
  1. … 71 more files in changeset.

Fixes INP-1331 - Integrate Plupload

    • -0
    • +2254
    ./js/uploader/plupload.dev.js
    • -0
    • +10211
    ./js/uploader/moxie.js
    • -292
    • +14
    ./js/uploader/upload_manager.js
  1. … 3 more files in changeset.

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

  1. … 20 more files in changeset.

Fixes INP-1290 - Deal with "svn:ignore" attributes

  1. … 8 more files in changeset.

Fixes INP-1251 - Add support for using jQueryUI Autocomplete

    • -4
    • +4
    ./js/jquery/jquery-ui-1.10.3.custom.min.js
    • binary
    ./js/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png
    • binary
    ./js/jquery/ui-lightness/images/ui-icons_222222_256x240.png
    • -0
    • +624
    ./js/jquery/ui-lightness/jquery-ui-1.10.3.custom.css
  1. … 14 more files in changeset.

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

  1. … 10 more files in changeset.

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

    • -1
    • +1
    ./categories/categories_edit_relations.tpl
  1. … 59 more files in changeset.

Fixes INP-1318 - Add support for multi-select to AjaxDropdownPreloader control

Fixes INP-1274 - Move deployment script log to database

    • -0
    • +5
    ./modules/modules_tabs.tpl
  1. … 15 more files in changeset.

Fixes INP-1309 - Implement inline editing

    • -0
    • +21
    ./img/top_frame/icons/saving_indicator.gif
  1. … 14 more files in changeset.