trunk

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

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

"Home" category fix in permission editor

completed permission editing system

    • -5
    • +14
    ./core/admin_templates/js/catalog.js
    • -5
    • +14
    ./kernel/admin_templates/incs/catalog.js
    • -0
    • +1
    ./admin/install/langpacks/english.lang

new permissions editor

    • -0
    • +4
    ./admin/install/langpacks/english.lang

category permissions

    • -11
    • +21
    ./core/admin_templates/js/catalog.js
    • -11
    • +21
    ./kernel/admin_templates/incs/catalog.js
    • binary
    ./kernel/admin_templates/img/perm_red.gif
    • binary
    ./kernel/admin_templates/img/perm_green.gif
    • -10
    • +12
    ./core/admin_templates/categories/permissions_tab.tpl

category images

    • -1
    • +1
    ./kernel/units/images/images_config.php

images edit refactoring

    • -0
    • +59
    ./core/admin_templates/categories/images_edit.tpl
    • -2
    • +149
    ./kernel/admin_templates/incs/image_blocks.tpl
    • -0
    • +59
    ./kernel/admin_templates/categories/images_edit.tpl
    • -2
    • +149
    ./core/admin_templates/incs/image_blocks.tpl

""

""

category permissions editor

category permissions editor

    • -20
    • +2
    ./kernel/admin_templates/incs/ajax.js

""

""

category.edit.permissions tab

    • -1
    • +1
    ./kernel/admin_templates/incs/toolbar.js
    • -3
    • +3
    ./core/admin_templates/catalog/catalog.tpl
    • -1
    • +4
    ./kernel/admin_templates/incs/catalog.js
    • -0
    • +18
    ./core/admin_templates/categories/permissions_tab.tpl
    • -3
    • +4
    ./kernel/units/admin/admin_tag_processor.php
    • -3
    • +4
    ./core/units/admin/admin_tag_processor.php
    • -0
    • +18
    ./kernel/admin_templates/categories/permissions_tab.tpl

merge from RC

    • -0
    • +1
    ./admin/install/langpacks/english.lang
    • -53
    • +26
    ./kernel/units/general/custom_fields.php
    • -53
    • +26
    ./core/units/general/custom_fields.php
      • empty log message ***
    • -0
    • +1
    ./core/units/general/general_config.php
    • -1
    • +10
    ./core/units/groups/groups_config.php
    • -0
    • +1
    ./kernel/units/general/general_config.php
    • -1
    • +10
    ./kernel/units/groups/groups_config.php
    • -20
    • +20
    ./kernel/admin_templates/incs/grid_blocks.tpl
      • empty log message ***
  1. … 1 more file in changeset.
      • empty log message ***
    • -23
    • +29
    ./kernel/admin_templates/incs/grid.js

old inportal now has name & descriptiom ml too

      • empty log message ***
    • -1
    • +2
    ./kernel/units/groups/groups_config.php
      • empty log message ***

Merged from RC (mostly new payment GWs)

    • -3
    • +3
    ./kernel/admin_templates/incs/script.js

newer nowperm grid in catalog

      • empty log message ***
    • -0
    • +116
    ./kernel/admin_templates/popups/editor.tpl
    • -13
    • +16
    ./kernel/admin_templates/incs/script.js
    • -2
    • +4
    ./core/kernel/parser/template_parser.php
    • -39
    • +55
    ./kernel/units/reviews/reviews_event_handler.php
    • -39
    • +55
    ./core/units/reviews/reviews_event_handler.php
    • -15
    • +15
    ./admin/editor/cmseditor/fckeditor.php
    • -28
    • +33
    ./core/units/reviews/reviews_config.php
  1. … 14 more files in changeset.
      • empty log message ***
    • -1
    • +1
    ./core/units/general/cat_event_handler.php
      • empty log message ***
    • -2
    • +2
    ./kernel/admin_templates/sections_list.tpl
  1. … 1 more file in changeset.
      • empty log message ***
    • -7
    • +7
    ./core/units/general/cat_tag_processor.php