• last updated 21 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

    • -0
    • +1153
    ./advanced/editor_template_src.js
    • -0
    • +162
    ./advanced/docs/en/common_buttons.htm
  1. … 7820 more files in changeset.
file main.css was initially added on branch oacs-5-9.

file button_bg_black.png was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/o2k7/img/button_bg_black.png
    • binary
    ./openacs/skins/o2k7/img/button_bg_black.png
file button_bg_silver.png was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/o2k7/img/button_bg_silver.png
    • binary
    ./openacs/skins/o2k7/img/button_bg_silver.png
file ui_black.css was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/skins/o2k7/ui_black.css
    • -0
    • +0
    ./openacs/skins/o2k7/ui_black.css
file button_bg.png was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/o2k7/img/button_bg.png
    • binary
    ./openacs/skins/o2k7/img/button_bg.png
    • binary
    ./simple/skins/o2k7/img/button_bg.png
file ui_silver.css was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/skins/o2k7/ui_silver.css
    • -0
    • +0
    ./openacs/skins/o2k7/ui_silver.css
file items.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/default/img/items.gif
    • binary
    ./openacs/skins/default/img/items.gif
file tabs.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/default/img/tabs.gif
    • binary
    ./openacs/skins/default/img/tabs.gif
file progress.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/default/img/progress.gif
    • binary
    ./openacs/skins/default/img/progress.gif
  1. … 1 more file in changeset.
file menu_arrow.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/default/img/menu_arrow.gif
    • binary
    ./openacs/skins/default/img/menu_arrow.gif
file dialog.css was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/skins/default/dialog.css
    • -0
    • +0
    ./advanced/skins/o2k7/dialog.css
    • -0
    • +0
    ./openacs/skins/default/dialog.css
    • -0
    • +0
    ./openacs/skins/o2k7/dialog.css
  1. … 2 more files in changeset.
file buttons.png was initially added on branch oacs-5-9.

    • binary
    ./advanced/skins/default/img/buttons.png
    • binary
    ./openacs/skins/default/img/buttons.png
file ui.css was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/skins/default/ui.css
    • -0
    • +0
    ./advanced/skins/o2k7/ui.css
    • -0
    • +0
    ./openacs/skins/default/ui.css
    • -0
    • +0
    ./openacs/skins/o2k7/ui.css
    • -0
    • +0
    ./simple/skins/default/ui.css
    • -0
    • +0
    ./simple/skins/o2k7/ui.css
file source_editor.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/js/source_editor.js
    • -0
    • +0
    ./advanced/jscripts/source_editor.js
    • -0
    • +0
    ./openacs/js/source_editor.js
    • -0
    • +0
    ./openacs/jscripts/source_editor.js
file about.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/jscripts/about.js
    • -0
    • +0
    ./openacs/jscripts/about.js
file color_picker.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/js/color_picker.js
    • -0
    • +0
    ./advanced/jscripts/color_picker.js
    • -0
    • +0
    ./openacs/js/color_picker.js
    • -0
    • +0
    ./openacs/jscripts/color_picker.js
  1. … 1 more file in changeset.
file charmap.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/js/charmap.js
    • -0
    • +0
    ./advanced/jscripts/charmap.js
    • -0
    • +0
    ./openacs/js/charmap.js
    • -0
    • +0
    ./openacs/jscripts/charmap.js
file anchor.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./advanced/js/anchor.js
    • -0
    • +0
    ./advanced/jscripts/anchor.js
    • -0
    • +0
    ./openacs/jscripts/anchor.js
file tab_end.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/xp/tab_end.gif
    • binary
    ./openacs/images/xp/tab_end.gif
file icons.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/img/icons.gif
    • binary
    ./openacs/img/icons.gif
    • binary
    ./simple/img/icons.gif
file colorpicker.jpg was initially added on branch oacs-5-9.

    • binary
    ./advanced/img/colorpicker.jpg
    • binary
    ./openacs/img/colorpicker.jpg
file tabs_bg.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/xp/tabs_bg.gif
    • binary
    ./openacs/images/xp/tabs_bg.gif
file tab_sel_end.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/xp/tab_sel_end.gif
    • binary
    ./openacs/images/xp/tab_sel_end.gif
file tab_sel_bg.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/xp/tab_sel_bg.gif
    • binary
    ./openacs/images/xp/tab_sel_bg.gif
file underline_tw.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/underline_tw.gif
    • binary
    ./openacs/images/underline_tw.gif
    • binary
    ./simple/images/underline_tw.gif
file tab_bg.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/xp/tab_bg.gif
    • binary
    ./openacs/images/xp/tab_bg.gif
file visualaid.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/visualaid.gif
    • binary
    ./openacs/images/visualaid.gif
file unlink.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/unlink.gif
    • binary
    ./openacs/images/unlink.gif
file undo.gif was initially added on branch oacs-5-9.

    • binary
    ./advanced/images/undo.gif
    • binary
    ./openacs/images/undo.gif
    • binary
    ./simple/images/undo.gif