In-Portal

branches

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 3
Total Committers: 11
Last Commit: 22 Nov
Commits this week: 3
Total Lines of Code (LoC): 0
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 minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 18 Nov 2016
3:33 am

Alex

[backported] Fixes INP-1636 - Show custom fields on Administrator adding/editing

Options
  1. ./5.2.x
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +7
    ./5.2.x/core/admin_templates/users/admins_edit.tpl
3:30 am

Alex

[backported] Fixes INP-1635 - Create IDBConnection interface

Conflicts:

  • core/kernel/db/db_connection.php
  • core/kernel/utility/unit_config.php
Options
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +262
    ./5.2.x/core/kernel/db/i_db_connection.php
    • -0
    • +0
    ./5.2.x/robots.txt
    • -4
    • +4
    ./5.2.x/core/kernel/application.php
    • -3
    • +3
    ./5.2.x/core/kernel/kbase.php
    • -22
    • +184
    ./5.2.x/core/kernel/db/db_load_balancer.php
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/LICENSE
    • -2
    • +2
    ./5.2.x/core/units/system_event_subscriptions/system_event_subscription_tp.php
    • -0
    • +1
    ./5.2.x/core/kernel/startup.php
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/LICENSES
    • -1
    • +1
    ./5.2.x/core/units/users/users_syncronize.php
  14. ./5.2.x
    • -0
    • +0
    ./5.2.x/README
  16. … 7 more files in changeset.
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
    ./5.3.x/INSTALL
    • -0
    • +0
    ./5.3.x/CREDITS
    • -0
    • +0
    ./5.3.x/.htaccess
    • -0
    • +0
    ./5.3.x/LICENSES
    • -0
    • +0
    ./5.3.x/LICENSE
    • -0
    • +0
    ./5.3.x/COPYRIGHT
    • -0
    • +0
    ./5.3.x/robots.txt
    • -0
    • +0
    ./5.3.x/index.php
    • -0
    • +0
    ./5.3.x/README
  10. ./5.3.x
2:21 am

Alex

[backported] Fixes INP-1602 - Make styleSet name configurable in FCKEditor tag

Options
    • -7
    • +15
    ./5.2.x/core/units/helpers/fck_helper.php
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/COPYRIGHT
  11. ./5.2.x
2:19 am

Alex

[backported] Fixes INP-1601 - Perform search, when ENTER used in "grid_like_combo_filter" block (the jQueryUI.Autocomplete)

Options
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/LICENSES
    • -1
    • +6
    ./5.2.x/core/admin_templates/incs/grid_blocks.tpl
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/CREDITS
  10. ./5.2.x
    • -0
    • +0
    ./5.2.x/README
2:17 am

Alex

[backported] Fixes INP-1604 - Adapt error output for CLI

Options
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/INSTALL
    • -4
    • +59
    ./5.2.x/core/kernel/utility/logger.php
  11. ./5.2.x
2:12 am

Alex

[backported] Fixes INP-1629 - Change CKEditor style loading to allow working on Front-End

Options
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/LICENSE
    • -1
    • +3
    ./5.2.x/core/units/helpers/fck_helper.php
    • -0
    • +0
    ./5.2.x/CREDITS
  7. ./5.2.x
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/README
1:50 am

Alex

[backported] Fixes INP-1607 - PHP 7 compatibility issues

Options
  1. ./5.2.x
    • -0
    • +0
    ./5.2.x/LICENSES
    • -1
    • +3
    ./5.2.x/core/units/images/image_tag_processor.php
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/CREDITS
    • -10
    • +1
    ./5.2.x/core/kernel/db/db_connection.php
    • -5
    • +4
    ./5.2.x/core/units/helpers/json_helper.php
    • -5
    • +5
    ./5.2.x/core/units/helpers/mailbox_helper.php
    • -0
    • +0
    ./5.2.x/INSTALL
    • -42
    • +31
    ./5.2.x/core/kernel/db/dblist.php
    • -1
    • +4
    ./5.2.x/core/install/install_toolkit.php
    • -0
    • +0
    ./5.2.x/robots.txt
    • -4
    • +13
    ./5.2.x/core/units/categories/cache_updater.php
    • -0
    • +0
    ./5.2.x/index.php
1:39 am

Alex

[backported] Fixes INP-1606 - CKEditor anchor query shouldn't set last visited template

Options
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSE
    • -3
    • +6
    ./5.2.x/core/ckeditor/plugins/my_link/plugin.js
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/.htaccess
  9. ./5.2.x
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/robots.txt
1:36 am

Alex

[backported] Fixes INP-1605 - Don't calculate "profiler enabled" state each time in class factory

Conflicts:

  • core/kernel/utility/factory.php
Options
    • -2
    • +2
    ./5.2.x/core/kernel/application.php
    • -0
    • +0
    ./5.2.x/INSTALL
    • -80
    • +98
    ./5.2.x/core/kernel/utility/factory.php
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSE
  7. ./5.2.x
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/index.php
Sunday 13 Nov 2016
3:41 pm

Alex

[backported] Fixes INP-1610 - Don't call "refreshModuleInfo" twice in a row

Options
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/.htaccess
    • -2
    • +0
    ./5.2.x/core/install/install_toolkit.php
    • -0
    • +0
    ./5.2.x/CREDITS
  9. ./5.2.x
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/COPYRIGHT
3:39 pm

Alex

[backported] Fixes INP-1609 - Don't report empty forms as missing

Conflicts:

  • core/kernel/kbase.php
Options
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/robots.txt
  3. ./5.2.x
    • -0
    • +0
    ./5.2.x/INSTALL
    • -1
    • +1
    ./5.2.x/core/kernel/kbase.php
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/CREDITS
3:33 pm

Alex

[backported] Fixes INP-1608 - Register own auto-loader before others

Options
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/INSTALL
    • -1
    • +1
    ./5.2.x/core/kernel/utility/factory.php
    • -0
    • +0
    ./5.2.x/LICENSE
  7. ./5.2.x
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/README
3:29 pm

Alex

[backported] Fixes INP-1615 - Reset cached sorting on sorting configuration change

Options
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +37
    ./5.2.x/core/units/configuration/configuration_event_handler.php
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/CREDITS
  11. ./5.2.x
3:24 pm

Alex

[backported] Fixes INP-1613 - Integrate Plupload

Conflicts:

  • core/kernel/db/db_event_handler.php
Options
    • -12
    • +7
    ./5.2.x/core/admin_templates/incs/form_blocks.tpl
    • binary
    ./5.2.x/core/admin_templates/img/upload.png
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/LICENSE
    • binary
    ./5.2.x/core/admin_templates/swfupload.swf
    • -292
    • +14
    ./5.2.x/core/admin_templates/js/uploader/upload_manager.js
    • -0
    • +332
    ./5.2.x/core/units/helpers/upload_helper.php
    • -323
    • +255
    ./5.2.x/core/admin_templates/js/uploader/uploader.js
    • -0
    • +2254
    ./5.2.x/core/admin_templates/js/uploader/plupload.dev.js
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/robots.txt
    • -201
    • +37
    ./5.2.x/core/kernel/db/db_event_handler.php
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/.htaccess
  16. … 6 more files in changeset.
2:59 pm

Alex

[backported] Fixes INP-1625 - Add support for using jQueryUI Autocomplete

Conflicts:

  • core/admin_templates/js/ajax_dropdown.js
Options
    • -0
    • +0
    ./5.2.x/robots.txt
    • -4
    • +4
    ./5.2.x/core/admin_templates/js/jquery/jquery-ui-1.10.3.custom.min.js
    • -19
    • +18
    ./5.2.x/core/units/configuration/configuration_event_handler.php
    • -0
    • +0
    ./5.2.x/CREDITS
  5. ./5.2.x/core/admin_templates/js/jquery/ui-lightness
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -1
    • +1
    ./5.2.x/core/admin_templates/incs/header.tpl
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/index.php
    • -15
    • +64
    ./5.2.x/core/kernel/db/db_event_handler.php
    • -1
    • +1
    ./5.2.x/core/units/email_templates/email_templates_config.php
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/LICENSE
    • -5
    • +3
    ./5.2.x/core/admin_templates/incs/grid_blocks.tpl
  16. … 24 more files in changeset.
2:08 pm

Alex

[backported] Fixes INP-1626 - Add 'admin' meta-permission

Options
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/.htaccess
    • -1
    • +9
    ./5.2.x/core/units/helpers/permissions_helper.php
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/README
    • -6
    • +0
    ./5.2.x/core/units/configuration/configuration_event_handler.php
  10. ./5.2.x
    • -0
    • +0
    ./5.2.x/LICENSES
    • -12
    • +2
    ./5.2.x/core/kernel/db/db_event_handler.php
    • -0
    • +0
    ./5.2.x/LICENSE
2:06 pm

Alex

[backported] Fixes INP-1616 - Change module-dependency to unit-dependency

Options
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/CREDITS
    • -1
    • +1
    ./5.2.x/core/kernel/application.php
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/.htaccess
  11. ./5.2.x
    • -1
    • +1
    ./5.2.x/core/units/categories/categories_tag_processor.php
2:00 pm

Alex

[backported] Fixes INP-1614 - Create fallback for missing *Ajax events

Options
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +47
    ./5.2.x/core/kernel/event_handler.php
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/LICENSE
  11. ./5.2.x
1:53 pm

Alex

[backported] Fixes INP-1622 - Create message filter for Debugger Report

Conflicts:

  • core/kernel/utility/debugger.php
Options
  1. ./5.2.x
    • -2
    • +37
    ./5.2.x/core/kernel/utility/debugger/debugger.js
    • -2
    • +71
    ./5.2.x/core/kernel/utility/debugger.php
    • -0
    • +0
    ./5.2.x/robots.txt
    • -1
    • +2
    ./5.2.x/core/kernel/utility/debugger/debugger.css
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/.htaccess
1:43 pm

Alex

[backported] Fixes INP-1617 - Implement inline editing in CKEditor

Conflicts:

  • core/admin_templates/js/template_manager.js
  • core/kernel/db/db_tag_processor.php
  • core/units/content/content_eh.php
Options
    • -298
    • +344
    ./5.2.x/core/admin_templates/js/template_manager.js
    • -0
    • +0
    ./5.2.x/.htaccess
  3. ./5.2.x
    • -0
    • +1
    ./5.2.x/core/install/english.lang
    • -0
    • +0
    ./5.2.x/README
    • -155
    • +16
    ./5.2.x/core/kernel/db/db_tag_processor.php
    • -1
    • +1
    ./5.2.x/core/ckeditor/plugins/my_document/plugin.js
    • -17
    • +41
    ./5.2.x/core/units/categories/categories_tag_processor.php
    • -0
    • +0
    ./5.2.x/INSTALL
    • -28
    • +41
    ./5.2.x/core/units/content/content_eh.php
    • -0
    • +26
    ./5.2.x/core/ckeditor/plugins/my_document/images/document.png
    • -0
    • +22
    ./5.2.x/core/admin_templates/img/top_frame/icons/saving_indicator.gif
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/LICENSE
    • -1
    • +12
    ./5.2.x/core/admin_templates/js/inp_ckconfig.js
  16. … 14 more files in changeset.
12:54 pm

Alex

[backported] Fixes INP-1618 - Append new column to the grid at designated position

Conflicts:

  • core/units/admin/admin_tag_processor.php
  • core/units/helpers/col_picker_helper.php
  • core/units/helpers/csv_helper.php
Options
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/CREDITS
    • -5
    • +3
    ./5.2.x/core/units/helpers/csv_helper.php
    • -4
    • +5
    ./5.2.x/core/kernel/db/db_event_handler.php
    • -0
    • +0
    ./5.2.x/.htaccess
  6. ./5.2.x
    • -13
    • +17
    ./5.2.x/core/units/admin/admin_tag_processor.php
    • -167
    • +450
    ./5.2.x/core/units/helpers/col_picker_helper.php
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/INSTALL
    • -16
    • +12
    ./5.2.x/core/kernel/db/db_tag_processor.php
    • -7
    • +5
    ./5.2.x/core/units/admin/admin_events_handler.php
    • -0
    • +0
    ./5.2.x/LICENSE
12:30 pm

Alex

[backported] Fixes INP-1621 - Migrate to MySQLi Driver

Conflicts:

  • core/kernel/db/db_connection.php
  • core/kernel/utility/temp_handler.php
Options
    • -2
    • +2
    ./5.2.x/core/kernel/startup.php
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSES
    • -1
    • +1
    ./5.2.x/core/install/prerequisites.php
  5. ./5.2.x
    • -163
    • +61
    ./5.2.x/core/kernel/db/db_connection.php
    • -2
    • +2
    ./5.2.x/core/kernel/utility/temp_handler.php
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/index.php
    • -2
    • +2
    ./5.2.x/core/install/step_templates/db_config.tpl
    • -1
    • +1
    ./5.2.x/core/install/step_templates/db_reconfig.tpl
    • -0
    • +0
    ./5.2.x/INSTALL
    • -7
    • +7
    ./5.2.x/core/kernel/db/db_load_balancer.php
12:04 pm

Alex

[backported] Fixes INP-1623 - Improve cross-browser support in Category Item Selector

Options
    • -0
    • +0
    ./5.2.x/robots.txt
    • -0
    • +0
    ./5.2.x/index.php
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -1
    • +7
    ./5.2.x/core/admin_templates/catalog/catalog_elements.tpl
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/INSTALL
  11. ./5.2.x
11:56 am

Alex

[backported] Fixes INP-1619 - Disable content revision toolbar related js code when toolbar is disabled

Conflicts:

  • core/admin_templates/js/template_manager.js
Options
    • -56
    • +57
    ./5.2.x/core/admin_templates/js/template_manager.js
    • -0
    • +0
    ./5.2.x/.htaccess
    • -0
    • +0
    ./5.2.x/CREDITS
    • -0
    • +0
    ./5.2.x/INSTALL
    • -0
    • +0
    ./5.2.x/README
    • -0
    • +0
    ./5.2.x/LICENSES
    • -0
    • +0
    ./5.2.x/LICENSE
    • -0
    • +0
    ./5.2.x/index.php
  9. ./5.2.x
    • -0
    • +0
    ./5.2.x/COPYRIGHT
    • -0
    • +0
    ./5.2.x/robots.txt
11:44 am

Alex

[backported] Fixes INP-1620 - Upgrade to CKEditor 4.2

Options
    • -6
    • +0
    ./5.2.x/core/ckeditor/plugins/devtools/lang/tr.js
    • -86
    • +112
    ./5.2.x/core/ckeditor/ckfinder/lang/hu.js
    • -105
    • +0
    ./5.2.x/core/ckeditor/ckfinder/core/connector/php/php4/CommandHandler/GetFolders.php
    • -1
    • +1
    ./5.2.x/core/admin_templates/incs/custom_blocks.tpl
    • -9
    • +35
    ./5.2.x/core/ckeditor/ckfinder/lang/it.js
    • -7
    • +22
    ./5.2.x/core/ckeditor/plugins/flash/dialogs/flash.js
    • -6
    • +0
    ./5.2.x/core/ckeditor/lang/en-ca.js
    • binary
    ./5.2.x/core/ckeditor/skins/v2/images/sprites_ie6.png
    • -6
    • +0
    ./5.2.x/core/ckeditor/lang/it.js
    • -1
    • +1
    ./5.2.x/core/admin_templates/categories/edit_content.tpl
    • -130
    • +0
    ./5.2.x/core/ckeditor/ckfinder/core/connector/php/php4/CommandHandler/CommandHandlerBase.php
    • binary
    ./5.2.x/core/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
    • -6
    • +0
    ./5.2.x/core/ckeditor/plugins/placeholder/lang/vi.js
    • -1
    • +2
    ./5.2.x/core/ckeditor/ckfinder/core/connector/php/lang/en.php
    • -20
    • +0
    ./5.2.x/core/ckeditor/ckeditor_basic_source.js
  16. … 755 more files in changeset.
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
    ./5.3.x/core/ckeditor/ckfinder/config.php
    • -5
    • +2
    ./5.3.x/core/units/visits/visits_tag_processor.php
    • -13
    • +35
    ./5.3.x/core/kernel/application.php
    • -9
    • +12
    ./5.3.x/core/admin_templates/tree.tpl
    • -0
    • +44
    ./5.3.x/core/install/upgrades.php
    • -0
    • +0
    ./5.3.x/core/admin_templates/js/cron.js
    • -6
    • +6
    ./5.3.x/tools/build/targets/folders.xml
    • -0
    • +2
    ./5.3.x/core/units/categories/categories_config.php
    • -4
    • +4
    ./5.3.x/core/units/structure/structure_config.php
    • -6
    • +6
    ./5.3.x/core/admin_templates/incs/cms.css
    • -3
    • +16
    ./5.3.x/core/kernel/kbase.php
    • -7
    • +2
    ./5.3.x/core/units/permissions/permissions_tag_processor.php
    • -1
    • +16
    ./5.3.x/core/kernel/nparser/nparser_config.php
    • -4
    • +7
    ./5.3.x/core/units/helpers/upload_helper.php
    • -2
    • +4
    ./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
    ./5.3.x/core/units/helpers/country_states_helper.php
    • -1
    • +1
    ./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
    ./5.3.x/core/kernel/utility/temp_handler.php
    • -16
    • +16
    ./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
    ./5.3.x/admin/system_presets/simple/email_templates_email-template.php
    • -2
    • +2
    ./5.3.x/core/units/logs/system_logs/system_logs_config.php
    • -4
    • +4
    ./5.3.x/core/units/skins/skins_config.php
    • -2
    • +2
    ./5.3.x/core/units/visits/visits_config.php
    • -2
    • +2
    ./5.3.x/core/admin_templates/regional/phrases_edit.tpl
    • -3
    • +3
    ./5.3.x/core/units/categories/categories_config.php
    • -41
    • +41
    ./5.3.x/core/units/email_templates/email_templates_config.php
    • -3
    • +3
    ./5.3.x/core/units/structure/structure_config.php
    • -0
    • +1
    ./5.3.x/core/kernel/utility/logger.php