trunk

Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
      • empty log message ***
      • empty log message ***

""

Merged from RC (after 1.2.1 release)

    • -0
    • +60
    ./kernel/units/visits/visits_list.php
    • -26
    • +32
    ./core/units/groups/groups_config.php
    • -31
    • +43
    ./kernel/units/admin/admin_config.php
    • -6
    • +17
    ./kernel/include/adodb/adodb.inc.php
    • -4
    • +5
    ./core/units/general/cat_dbitem_export.php
    • -131
    • +306
    ./core/units/general/cat_event_handler.php
  1. … 250 more files in changeset.

mb: 0010311

    • -0
    • +17
    ./core/kernel/db/db_tag_processor.php
    • -26
    • +11
    ./kernel/admin_templates/regional/phrases_edit.tpl
      • empty log message ***

l

l

      • empty log message ***
      • empty log message ***
      • empty log message ***
    • -6
    • +6
    ./admin/editor/FCKeditor/fckeditor.php
      • empty log message ***
    • -7
    • +5
    ./core/kernel/utility/debugger/debugger.js
    • -1
    • +11
    ./core/kernel/parser/construct_tags.php
    • -1
    • +5
    ./core/units/general/my_application.php
    • -1
    • +5
    ./kernel/units/general/my_application.php

langpack fixes

    • -3
    • +0
    ./admin/install/langpacks/english.lang
    • -86
    • +0
    ./kernel/admin_templates/incs/export.js

new ajax progress bar now used instead old ajax one (green)

    • -2
    • +7
    ./core/units/general/cat_dbitem_export.php
    • -0
    • +5
    ./core/units/general/cat_tag_processor.php
      • empty log message ***
    • -0
    • +3
    ./admin/install/langpacks/english.lang
      • empty log message ***
    • -2
    • +3
    ./kernel/admin_templates/incs/catalog.js
      • empty log message ***
    • -1
    • +1
    ./core/units/general/my_application.php
    • -1
    • +1
    ./kernel/units/general/my_application.php

last merge from RC [1.2.0]

    • -30
    • +31
    ./kernel/units/users/users_event_handler.php
    • -2
    • +2
    ./admin/install/upgrades/readme_1_2_0.txt
    • -30
    • +31
    ./core/units/users/users_event_handler.php
    • -1
    • +9
    ./core/units/general/cat_dbitem_export.php
  1. … 5 more files in changeset.
      • empty log message ***
    • -12
    • +21
    ./core/units/general/helpers/filenames_helper.php
      • empty log message ***
    • -0
    • +17
    ./core/units/general/helpers/helpers_config.php
    • -0
    • +17
    ./kernel/units/general/helpers/helpers_config.php
    • -0
    • +81
    ./core/units/general/helpers/filenames_helper.php
    • -0
    • +81
    ./kernel/units/general/helpers/filenames_helper.php
    • -2
    • +4
    ./core/units/general/cat_event_handler.php
    • -57
    • +22
    ./core/units/general/cat_dbitem.php
    • -7
    • +11
    ./admin/install/inportal_schema.sql
    • -57
    • +22
    ./kernel/units/general/cat_dbitem.php
    • -2
    • +6
    ./core/units/general/my_application.php
    • -2
    • +6
    ./kernel/units/general/my_application.php

new progress bar

    • -14
    • +20
    ./kernel/admin_templates/incs/ajax.js
    • -20
    • +42
    ./kernel/admin_templates/incs/form_blocks.tpl

orders fix

    • -8
    • +36
    ./kernel/admin_templates/incs/ajax.js
    • -0
    • +14
    ./kernel/admin_templates/incs/script.js

new tool for creating ajax progressbar js AjaxProgressBar class

    • -1
    • +42
    ./kernel/admin_templates/incs/ajax.js
    • binary
    ./kernel/admin_templates/img/progress_left.gif
    • binary
    ./kernel/admin_templates/img/progress_done.gif
    • -1
    • +35
    ./kernel/admin_templates/incs/form_blocks.tpl
    • -0
    • +6
    ./kernel/admin_templates/incs/style.css

merge from RC [1.2.0]

    • -14
    • +15
    ./kernel/units/users/users_event_handler.php
  1. … 100 more files in changeset.
      • empty log message ***

in-cms relations

relations for categories added, ml titlefield problem in relations fixed

    • -0
    • +76
    ./kernel/admin_templates/categories/relations_edit.tpl
    • -0
    • +76
    ./core/admin_templates/categories/relations_edit.tpl
      • empty log message ***
    • -57
    • +57
    ./core/kernel/db/db_tag_processor.php
    • -2
    • +3
    ./kernel/units/general/helpers/sections_helper.php
    • -1
    • +1
    ./core/admin_templates/incs/custom_blocks.tpl
    • -1
    • +1
    ./kernel/admin_templates/incs/custom_blocks.tpl
  1. … 5 more files in changeset.
      • empty log message ***
      • empty log message ***
    • -0
    • +2
    ./kernel/admin_templates/incs/catalog.js