In-Portal

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 23
Last Commit: 31 Oct
Commits this week: 1
Total Lines of Code (LoC): 261,005
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 31 Oct
4:52 am

Alex

Bug INP-1827 - Connect a testing framework

1. [merge fix] rely on class structure cache instead registering test suite classes manually

Options
    • -7
    • +0
    /branches/5.3.x/core/kernel/application.php
    • -0
    • +8
    /branches/5.3.x/core/install/cache/class_structure.php
Tuesday 29 Oct
3:52 am

Alex

Fixes INP-1882 - Rework URL-encoding in Debugger Report file URLs

Differential Revision: https://qa.in-portal.org/D492

Options
    • -41
    • +7
    /branches/5.3.x/core/kernel/utility/debugger.php
Saturday 19 Oct
2:54 pm

Alex

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
Options
    • -2
    • +26
    /branches/5.3.x/tools/class_locator.php
  2. /branches/5.3.x/core/tests
    • -1
    • +1
    /branches/5.3.x/.arcconfig
    • -428
    • +322
    /branches/5.3.x/composer.lock
  5. /branches/5.3.x
    • -8
    • +5
    /branches/5.3.x/tools/build/inc/custom_phpunit.xml
    • -1
    • +13
    /branches/5.3.x/core/kernel/utility/formatters/formatter.php
    • -0
    • +7
    /branches/5.3.x/core/kernel/application.php
    • -0
    • +2
    /branches/5.3.x/core/kernel/startup.php
    • -10
    • +21
    /branches/5.3.x/composer.json
    • -8
    • +5
    /branches/5.3.x/tools/build/inc/phpunit.xml
    • -1
    • +1
    /branches/5.3.x/core/install/prerequisites.php
    • -1
    • +1
    /branches/5.3.x/core/install/step_templates/sys_requirements.tpl
    • -8
    • +41
    /branches/5.3.x/core/install/cache/class_structure.php
    • -0
    • +12
    /branches/5.3.x/tools/mink_config.php-dist
  16. … 16 more files in changeset.
Wednesday 31 Jul
9:49 am

Alex

Fixes INP-1756 - Create "Security*" classes for security-related jobs

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

Options
    • -27
    • +42
    /branches/5.3.x/core/install.php
Tuesday 13 Sep 2022
8:08 am

Alex

Fixes INP-1822 - Use modern cookie encryption library

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

Options
    • -4
    • +3
    /branches/5.3.x/core/kernel/session/session.php
    • -0
    • +8
    /branches/5.3.x/core/install/upgrades.sql
    • -8
    • +8
    /branches/5.3.x/core/install/cache/class_structure.php
    • -70
    • +1
    /branches/5.3.x/core/units/helpers/user_helper.php
    • -178
    • +0
    /branches/5.3.x/core/kernel/utility/cookie_hasher.php
    • -10
    • +3
    /branches/5.3.x/core/kernel/utility/http_query.php
    • -1
    • +2
    /branches/5.3.x/core/install/english.lang
    • -0
    • +54
    /branches/5.3.x/core/units/configuration/configuration_event_handler.php
    • -2
    • +2
    /branches/5.3.x/core/install/install_data.sql
    • -0
    • +132
    /branches/5.3.x/core/kernel/managers/cookie_manager.php
    • -11
    • +0
    /branches/5.3.x/core/install.php
7:59 am

Alex

Merge of "in-portal/branches/5.2.x@16729" to "in-portal/branches/5.3.x@16727".

Options
    • -6
    • +55
    /branches/5.3.x/core/kernel/utility/debugger.php
    • -1
    • +6
    /branches/5.3.x/core/kernel/utility/http_query.php
  3. /branches/5.3.x
Monday 29 Aug 2022
2:58 am

Alex

Fixes INP-1422 - Store class map on disk

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

Options
    • -1
    • +1
    /branches/5.3.x/core/kernel/security/SecurityGeneratorPromise.php
    • -0
    • +18
    /branches/5.3.x/core/install/cache/class_structure.php
    • -5
    • +0
    /branches/5.3.x/core/kernel/application.php
2:52 am

Alex

Merge of "in-portal/branches/5.2.x@16725" to "in-portal/branches/5.3.x@16723".

Options
    • -18
    • +27
    /branches/5.3.x/core/install.php
  2. /branches/5.3.x
Tuesday 09 Aug 2022
1:23 am

Alex

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
Options
  1. /branches/5.3.x/core/kernel/security
    • -1
    • +19
    /branches/5.3.x/core/install.php
    • -318
    • +965
    /branches/5.3.x/composer.lock
    • -1
    • +5
    /branches/5.3.x/composer.json
    • -0
    • +1
    /branches/5.3.x/core/install/step_templates/sys_requirements.tpl
    • -0
    • +3
    /branches/5.3.x/core/install/prerequisites.php
    • -0
    • +2
    /branches/5.3.x/core/kernel/utility/system_config.php
  8. /branches/5.3.x
    • -0
    • +5
    /branches/5.3.x/core/kernel/application.php
    • -0
    • +274
    /branches/5.3.x/core/kernel/security/SecurityGeneratorPromise.php
    • -0
    • +228
    /branches/5.3.x/core/kernel/security/SecurityEncrypter.php
    • -0
    • +193
    /branches/5.3.x/core/kernel/security/SecurityGenerator.php
Wednesday 20 Jul 2022
2:09 am

Alex

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

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

Options
    • -2
    • +2
    /branches/5.3.x/core/units/configuration/configuration_config.php
    • -0
    • +1
    /branches/5.3.x/core/install/english.lang
    • -0
    • +25
    /branches/5.3.x/core/kernel/db/db_tag_processor.php
    • -0
    • +40
    /branches/5.3.x/core/admin_templates/incs/config_blocks.tpl
Saturday 29 Jul 2017
1:19 am

Alex

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
Options
    • -4
    • +28
    /branches/5.3.x/core/kernel/db/db_event_handler.php
    • -3
    • +5
    /branches/5.3.x/core/admin_templates/config/config_universal.tpl
    • -2
    • +2
    /branches/5.3.x/core/admin_templates/js/uploader/uploader.js
    • -1
    • +1
    /branches/5.3.x/core/units/mailing_lists/mailing_lists_config.php
  5. /branches/5.3.x
    • -4
    • +85
    /branches/5.3.x/core/units/categories/categories_event_handler.php
    • -1
    • +11
    /branches/5.3.x/.htaccess
    • -8
    • +22
    /branches/5.3.x/core/admin_templates/incs/form_blocks.tpl
    • -1
    • +14
    /branches/5.3.x/core/install/upgrades.sql
    • -2
    • +2
    /branches/5.3.x/core/admin_templates/popups/translator.tpl
    • -2
    • +2
    /branches/5.3.x/core/kernel/db/cat_event_handler.php
    • -7
    • +21
    /branches/5.3.x/core/kernel/utility/http_query.php
    • -1
    • +1
    /branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl
    • -1
    • +1
    /branches/5.3.x/core/units/helpers/navigation_bar.php
    • -11
    • +7
    /branches/5.3.x/core/kernel/utility/formatters/formatter.php
  16. … 57 more files in changeset.
Thursday 27 Jul 2017
3:55 am

Alex

Fixes INP-1710 - [bc fix] Asynchronous e-mail sending by default

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

Options
    • -6
    • +16
    /branches/5.3.x/core/kernel/utility/email.php
    • -0
    • +17
    /branches/5.3.x/core/units/email_templates/email_template_eh.php
    • -3
    • +11
    /branches/5.3.x/core/units/helpers/mailing_list_helper.php
    • -0
    • +36
    /branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php
Wednesday 19 Jul 2017
9:52 am

Alex

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

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

Options
    • -2
    • +5
    /branches/5.3.x/core/admin_templates/popups/editor.tpl
    • -6
    • +18
    /branches/5.3.x/core/admin_templates/js/forms.js
    • -1
    • +2
    /branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl
9:45 am

Alex

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

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

Options
    • -3
    • +5
    /branches/5.3.x/admin/system_presets/simple/inp_ckconfig.js
    • -3
    • +5
    /branches/5.3.x/core/admin_templates/js/inp_ckconfig.js
    • -4
    • +21
    /branches/5.3.x/core/units/helpers/fck_helper.php
Sunday 02 Jul 2017
8:50 am

Alex

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
Options
    • -0
    • +69
    /branches/5.3.x/core/kernel/globals.php
    • -10
    • +74
    /branches/5.3.x/core/kernel/utility/logger.php
    • -3
    • +6
    /branches/5.3.x/core/kernel/utility/debugger.php
    • -3
    • +9
    /branches/5.3.x/core/install/upgrades.sql
  5. /branches/5.3.x
Sunday 29 Jan 2017
12:28 pm

Alex

Merge of "in-portal/branches/5.2.x@16533" to "in-portal/branches/5.3.x@16532".

Options
    • -2
    • +13
    /branches/5.3.x/core/ckeditor/plugins/my_document/dialogs/document.js
    • -0
    • +1
    /branches/5.3.x/core/kernel/application.php
  3. /branches/5.3.x
    • -0
    • +1
    /branches/5.3.x/core/units/helpers/helpers_config.php
    • -6
    • +6
    /branches/5.3.x/core/kernel/nparser/ntags.php
Saturday 21 Jan 2017
12:58 pm

Alex

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

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

Options
    • -0
    • +18
    /branches/5.3.x/core/units/admin/admin_tag_processor.php
    • -1
    • +20
    /branches/5.3.x/core/admin_templates/incs/footer.tpl
    • -3
    • +7
    /branches/5.3.x/core/kernel/db/db_event_handler.php
12:52 pm

Alex

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

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

Options
    • -1
    • +3
    /branches/5.3.x/core/install/english.lang
    • -3
    • +4
    /branches/5.3.x/core/units/promo_blocks/promo_block_eh.php
    • -0
    • +3
    /branches/5.3.x/core/install/upgrades.sql
    • -4
    • +4
    /branches/5.3.x/core/units/promo_blocks/promo_blocks_config.php
    • -61
    • +2
    /branches/5.3.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
12:37 pm

Alex

Fixes INP-1547 - Create "promo-block:ImageField" tag

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

Options
    • -0
    • +32
    /branches/5.3.x/core/units/promo_blocks/promo_block_tp.php
12:31 pm

Alex

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

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

Options
    • -1
    • +1
    /branches/5.3.x/core/units/categories/categories_config.php
    • -0
    • +17
    /branches/5.3.x/core/admin_templates/catalog/advanced_view.tpl
10:45 am

Alex

Fixes INP-1584 - Add readonly mode to "st:ContentBlock" tag

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

Options
    • -1
    • +2
    /branches/5.3.x/core/units/categories/categories_tag_processor.php
Friday 20 Jan 2017
2:21 pm

Alex

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
Options
    • -1
    • +1
    /branches/5.3.x/core/units/files/file_tp.php
    • -15
    • +15
    /branches/5.3.x/core/units/email_templates/email_template_eh.php
    • -3
    • +3
    /branches/5.3.x/core/units/logs/email_logs/email_log_eh.php
    • -3
    • +3
    /branches/5.3.x/core/units/helpers/upload_helper.php
    • -1
    • +1
    /branches/5.3.x/core/units/helpers/captcha_helper.php
    • -3
    • +3
    /branches/5.3.x/core/units/promo_blocks/promo_block_tp.php
    • -10
    • +10
    /branches/5.3.x/core/units/mailing_lists/mailing_list_eh.php
  8. /branches/5.3.x
    • -15
    • +15
    /branches/5.3.x/core/units/configuration/configuration_event_handler.php
    • -6
    • +6
    /branches/5.3.x/core/kernel/utility/email.php
    • -2
    • +2
    /branches/5.3.x/core/units/promo_block_groups/promo_block_group_tp.php
    • -1
    • +1
    /branches/5.3.x/core/units/sections/site_config_tp.php
    • -2
    • +2
    /branches/5.3.x/core/units/helpers/navigation_bar.php
    • -62
    • +62
    /branches/5.3.x/core/units/categories/categories_event_handler.php
    • -1
    • +1
    /branches/5.3.x/core/units/stylesheets/stylesheets_event_handler.php
  16. … 165 more files in changeset.
Monday 26 Dec 2016
12:16 pm

Alex

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
Options
    • -0
    • +0
    /branches/5.3.x/.htaccess
    • -2
    • +10
    /branches/5.3.x/core/kernel/utility/email.php
    • -8
    • +1
    /branches/5.3.x/core/kernel/db/db_event_handler.php
    • -2
    • +16
    /branches/5.3.x/core/units/users/users_event_handler.php
    • -0
    • +0
    /branches/5.3.x/index.php
    • -47
    • +23
    /branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js
    • -0
    • +1
    /branches/5.3.x/core/install/upgrades.sql
    • -0
    • +1
    /branches/5.3.x/core/install/install_schema.sql
    • -6
    • +15
    /branches/5.3.x/core/kernel/utility/logger.php
    • -8
    • +11
    /branches/5.3.x/core/units/helpers/deployment_helper.php
    • -0
    • +0
    /branches/5.3.x/INSTALL
    • -1
    • +1
    /branches/5.3.x/core/admin_templates/js/jquery/thickbox/thickbox.css
    • -1
    • +1
    /branches/5.3.x/core/admin_templates/config/config_universal.tpl
    • -1
    • +2
    /branches/5.3.x/core/kernel/utility/formatters/password_formatter.php
    • -10
    • +3
    /branches/5.3.x/core/units/categories/categories_event_handler.php
  16. … 24 more files in changeset.
Friday 18 Nov 2016
5:17 am

Alex

Merge of "in-portal/branches/5.2.x@16439" to "in-portal/branches/5.3.x@16429".

Options
    • -0
    • +0
    /branches/5.3.x/.htaccess
    • -0
    • +0
    /branches/5.3.x/README
    • -0
    • +0
    /branches/5.3.x/LICENSES
    • -0
    • +0
    /branches/5.3.x/CREDITS
  5. /branches/5.3.x
    • -0
    • +0
    /branches/5.3.x/COPYRIGHT
    • -0
    • +0
    /branches/5.3.x/index.php
    • -0
    • +0
    /branches/5.3.x/INSTALL
    • -0
    • +0
    /branches/5.3.x/LICENSE
    • -0
    • +0
    /branches/5.3.x/robots.txt
Monday 14 Nov 2016
1:58 pm

Alex

Merge of "in-portal/branches/5.2.x@16428" to "in-portal/branches/5.3.x@16395".

Options
    • -0
    • +0
    /branches/5.3.x/INSTALL
    • -0
    • +0
    /branches/5.3.x/CREDITS
    • -0
    • +0
    /branches/5.3.x/.htaccess
    • -0
    • +0
    /branches/5.3.x/LICENSES
    • -0
    • +0
    /branches/5.3.x/LICENSE
    • -0
    • +0
    /branches/5.3.x/COPYRIGHT
    • -0
    • +0
    /branches/5.3.x/robots.txt
    • -0
    • +0
    /branches/5.3.x/index.php
    • -0
    • +0
    /branches/5.3.x/README
  10. /branches/5.3.x
Saturday 12 Nov 2016
6:43 am

Alex

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
Options
    • -3
    • +3
    /branches/5.3.x/core/ckeditor/ckfinder/config.php
    • -5
    • +2
    /branches/5.3.x/core/units/visits/visits_tag_processor.php
    • -13
    • +35
    /branches/5.3.x/core/kernel/application.php
    • -9
    • +12
    /branches/5.3.x/core/admin_templates/tree.tpl
    • -0
    • +44
    /branches/5.3.x/core/install/upgrades.php
    • -0
    • +0
    /branches/5.3.x/core/admin_templates/js/cron.js
    • -6
    • +6
    /branches/5.3.x/tools/build/targets/folders.xml
    • -0
    • +2
    /branches/5.3.x/core/units/categories/categories_config.php
    • -4
    • +4
    /branches/5.3.x/core/units/structure/structure_config.php
    • -6
    • +6
    /branches/5.3.x/core/admin_templates/incs/cms.css
    • -3
    • +16
    /branches/5.3.x/core/kernel/kbase.php
    • -7
    • +2
    /branches/5.3.x/core/units/permissions/permissions_tag_processor.php
    • -1
    • +16
    /branches/5.3.x/core/kernel/nparser/nparser_config.php
    • -4
    • +7
    /branches/5.3.x/core/units/helpers/upload_helper.php
    • -2
    • +4
    /branches/5.3.x/core/units/helpers/page_helper.php
  16. … 96 more files in changeset.
Tuesday 08 Nov 2016
6:32 am

Alex

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

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

Options
    • -2
    • +2
    /branches/5.3.x/core/units/helpers/country_states_helper.php
    • -1
    • +1
    /branches/5.3.x/core/units/helpers/upload_helper.php
Monday 07 Nov 2016
3:50 pm

Alex

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

Options
    • -2
    • +4
    /branches/5.3.x/core/kernel/utility/temp_handler.php
    • -16
    • +16
    /branches/5.3.x/core/admin_templates/js/forms.js
Sunday 06 Nov 2016
3:03 pm

Alex

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

Options
    • -1
    • +1
    /branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php
    • -2
    • +2
    /branches/5.3.x/core/units/logs/system_logs/system_logs_config.php
    • -4
    • +4
    /branches/5.3.x/core/units/skins/skins_config.php
    • -2
    • +2
    /branches/5.3.x/core/units/visits/visits_config.php
    • -2
    • +2
    /branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl
    • -3
    • +3
    /branches/5.3.x/core/units/categories/categories_config.php
    • -41
    • +41
    /branches/5.3.x/core/units/email_templates/email_templates_config.php
    • -3
    • +3
    /branches/5.3.x/core/units/structure/structure_config.php
    • -0
    • +1
    /branches/5.3.x/core/kernel/utility/logger.php
Monday 25 Jul 2016
4:14 am

Alex

Fixes INP-1539 - Make styleSet name configurable in FCKEditor tag

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

Options
    • -7
    • +15
    /branches/5.3.x/core/units/helpers/fck_helper.php