• last updated 18 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge with missing files

  1. … 1462 more files in changeset.
merge from oacs-5-10

    • -388
    • +0
    ./resources/xinha-nightly/Xinha.css
    • -5992
    • +0
    ./resources/xinha-nightly/XinhaConfig.js
    • -8426
    • +0
    ./resources/xinha-nightly/XinhaCore.js
    • -283
    • +0
    ./resources/xinha-nightly/XinhaLoader.js
    • -80
    • +0
    ./resources/xinha-nightly/dialog.js
    • -406
    • +0
    ./resources/xinha-nightly/functionsIE.js
    • -263
    • +0
    ./resources/xinha-nightly/getHTML.js
    • -256
    • +0
    ./resources/xinha-nightly/htmlarea.css
    • -23
    • +0
    ./resources/xinha-nightly/htmlarea.js
    • -327
    • +0
    ./resources/xinha-nightly/inline-dialog.js
    • -30
    • +0
    ./resources/xinha-nightly/license.txt
    • -76
    • +0
    ./resources/xinha-nightly/panel-dialog.js
  1. … 8085 more files in changeset.
file download.tcl was initially added on branch oacs-5-10.

    • -0
    • +0
    ./sitewide-admin/download.tcl
file index.tcl was initially added on branch oacs-5-10.

    • -0
    • +0
    ./sitewide-admin/index.tcl
file index.adp was initially added on branch oacs-5-10.

    • -0
    • +0
    ./sitewide-admin/index.adp
replace calls to depreacted proc "fs::remove_special_file_system_characters"

  1. … 3 more files in changeset.
fix typos

fix boolean expression in adp file

merged changes from the oacs-5-9 branch and resolved conflicts

    • -0
    • +388
    ./resources/xinha-nightly/Xinha.css
    • -0
    • +5992
    ./resources/xinha-nightly/XinhaConfig.js
    • -0
    • +8426
    ./resources/xinha-nightly/XinhaCore.js
    • -0
    • +283
    ./resources/xinha-nightly/XinhaLoader.js
    • -0
    • +80
    ./resources/xinha-nightly/dialog.js
    • -0
    • +406
    ./resources/xinha-nightly/functionsIE.js
    • -0
    • +263
    ./resources/xinha-nightly/getHTML.js
    • -0
    • +256
    ./resources/xinha-nightly/htmlarea.css
    • -0
    • +23
    ./resources/xinha-nightly/htmlarea.js
    • -0
    • +327
    ./resources/xinha-nightly/inline-dialog.js
    • -0
    • +30
    ./resources/xinha-nightly/license.txt
    • -0
    • +76
    ./resources/xinha-nightly/panel-dialog.js
  1. … 7820 more files in changeset.
file file-selector-oracle.xql was initially added on branch oacs-5-9.

file file-selector-postgres.xql was initially added on branch oacs-5-9.

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

    • binary
    ./resources/xinha-nightly/skins/silva/statusbar.png
file toolbar.png was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/silva/toolbar.png
file separator.png was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/titan/separator.png
    • binary
    ./resources/xinha-nightly/skins/xp-blue/separator.png
    • binary
    ./resources/xinha-nightly/skins/xp-green/separator.png
file dialog.jpg was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/silva/dialog.jpg
file back.png was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/inditreuse/back.png
    • binary
    ./resources/xinha-nightly/skins/titan/back.png
    • binary
    ./resources/xinha-nightly/skins/xp-blue/back.png
    • binary
    ./resources/xinha-nightly/skins/xp-green/back.png
file selected.png was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/titan/selected.png
    • binary
    ./resources/xinha-nightly/skins/xp-blue/selected.png
    • binary
    ./resources/xinha-nightly/skins/xp-green/selected.png
file hover.png was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/inditreuse/hover.png
    • binary
    ./resources/xinha-nightly/skins/titan/hover.png
    • binary
    ./resources/xinha-nightly/skins/xp-blue/hover.png
    • binary
    ./resources/xinha-nightly/skins/xp-green/hover.png
file button-background.gif was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/green-look/button-background.gif
file skin.css was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/skins/blue-look/skin.css
    • -0
    • +0
    ./resources/xinha-nightly/skins/green-look/skin.css
    • -0
    • +0
    ./resources/xinha-nightly/skins/inditreuse/skin.css
    • -0
    • +0
    ./resources/xinha-nightly/skins/silva/skin.css
    • -0
    • +0
    ./resources/xinha-nightly/skins/titan/skin.css
    • -0
    • +0
    ./resources/xinha-nightly/skins/xp-blue/skin.css
    • -0
    • +0
    ./resources/xinha-nightly/skins/xp-green/skin.css
file skin.xml was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/skins/blue-look/skin.xml
    • -0
    • +0
    ./resources/xinha-nightly/skins/silva/skin.xml
file link.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/popups/link.js
file button-background.png was initially added on branch oacs-5-9.

    • binary
    ./resources/xinha-nightly/skins/blue-look/button-background.png
    • binary
    ./resources/xinha-nightly/skins/green-look/button-background.png
    • binary
    ./resources/xinha-nightly/skins/inditreuse/button-background.png
    • binary
    ./resources/xinha-nightly/skins/titan/button-background.png
    • binary
    ./resources/xinha-nightly/skins/xp-blue/button-background.png
    • binary
    ./resources/xinha-nightly/skins/xp-green/button-background.png
file select_color.html was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/popups/select_color.html
file old_insert_image.html was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/popups/old_insert_image.html
file custom2.html was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/popups/custom2.html
file editor_help.html was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/popups/editor_help.html
file fr_ca.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/plugins/UnsavedChanges/lang/fr_ca.js
file about.html was initially added on branch oacs-5-9.

    • -0
    • +0
    ./resources/xinha-nightly/popups/about.html
file WysiwygWrap.js was initially added on branch oacs-5-9.