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

    • -0
    • +1116
    ./resources/tinymce/changelog.txt
    • -0
    • +111
    ./resources/tinymce/examples/custom_formats.html
    • -0
    • +101
    ./resources/tinymce/examples/full.html
    • -0
    • +10
    ./resources/tinymce/examples/index.html
    • -0
    • +17
    ./resources/tinymce/examples/menu.html
    • -0
    • +47
    ./resources/tinymce/examples/simple.html
    • -0
    • +216
    ./resources/tinymce/examples/skins.html
    • -0
    • +71
    ./resources/tinymce/examples/word.html
    • -0
    • +53
    ./resources/tinymce/examples/css/word.css
  1. … 7820 more files in changeset.
file form_utils.js was initially added on branch oacs-5-9.

file validate.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/tinymce/jscripts/tiny_mce/utils/validate.js
file mctabs.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/tinymce/jscripts/tiny_mce/utils/mctabs.js
file mclayer.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/tinymce/jscripts/tiny_mce/utils/mclayer.js
file editable_selects.js was initially added on branch oacs-5-9.

file main.css was initially added on branch oacs-5-9.

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

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

file ui_black.css was initially added on branch oacs-5-9.

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

file ui_silver.css was initially added on branch oacs-5-9.

file items.gif was initially added on branch oacs-5-9.

file tabs.gif was initially added on branch oacs-5-9.

file progress.gif was initially added on branch oacs-5-9.

  1. … 1 more file in changeset.
file menu_arrow.gif was initially added on branch oacs-5-9.

file dialog.css was initially added on branch oacs-5-9.

  1. … 2 more files in changeset.
file buttons.png was initially added on branch oacs-5-9.

file ui.css was initially added on branch oacs-5-9.

file source_editor.js was initially added on branch oacs-5-9.

file about.js was initially added on branch oacs-5-9.

file color_picker.js was initially added on branch oacs-5-9.

  1. … 1 more file in changeset.
file charmap.js was initially added on branch oacs-5-9.

file anchor.js was initially added on branch oacs-5-9.

file tab_end.gif was initially added on branch oacs-5-9.

file icons.gif was initially added on branch oacs-5-9.

file colorpicker.jpg was initially added on branch oacs-5-9.

file tabs_bg.gif was initially added on branch oacs-5-9.

file tab_sel_end.gif was initially added on branch oacs-5-9.

file tab_sel_bg.gif was initially added on branch oacs-5-9.