• last updated 23 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge TinyMCE 3.3.9.3

    • -0
    • +250
    ./resources/tinymce/changelog.txt
    • -0
    • +111
    ./resources/tinymce/examples/custom_formats.html
    • -145
    • +0
    ./resources/tinymce/examples/example_template.htm
  1. … 725 more files in changeset.
Merged oacs-5-6 to HEAD. HEAD now installs and passes all core tests. There

may still be some lingering problems due to my screwing up the oacs-5-6

branch earlier, I'll be looking into this later.

  1. … 214 more files in changeset.
Bumped to beta 3 so I could put in this important upgrade script, fixing

a problem with using package_instantiate_object to instantiate a base

(acs_object) object. Never done in core or .lrn code apparently because typically

you instantiate subtypes, but it is important to get right.

  1. … 26 more files in changeset.
- updated Xinha to 0.96.1 (released on 12th May 2010 NZST) .... we seem to need multiple commits nowadays...

  1. … 38 more files in changeset.
- updated Xinha to 0.96.1 (released on 12th May 2010 NZST)

    • -3
    • +477
    ./resources/xinha-nightly/Xinha.css
    • -7
    • +8297
    ./resources/xinha-nightly/XinhaCore.js
    • -3
    • +283
    ./resources/xinha-nightly/XinhaLoader.js
    • -0
    • +99
    ./resources/xinha-nightly/contrib/compress.php
    • -0
    • +107
    ./resources/xinha-nightly/contrib/compress_yui.php
    • -0
    • +178
    ./resources/xinha-nightly/contrib/lc_merge_strings.php
    • -1
    • +12
    ./resources/xinha-nightly/contrib/php-xinha.php
    • -0
    • +61
    ./resources/xinha-nightly/contrib/test_server.py
    • -3
    • +134
    ./resources/xinha-nightly/examples/XinhaConfig.js
    • -8
    • +150
    ./resources/xinha-nightly/lang/da.js
  1. … 263 more files in changeset.
Add a specific class to format form legend text.

  1. … 1 more file in changeset.
Add missing image button

Set f_title with file_name. We set the element value at the end

Non-info file merge results, with conflicts fixed

    • -1283
    • +0
    ./resources/tinymce/changelog
    • -0
    • +866
    ./resources/tinymce/changelog.txt
    • -0
    • +154
    ./resources/tinymce/jscripts/tiny_mce/langs/bg.js
    • -0
    • +154
    ./resources/tinymce/jscripts/tiny_mce/langs/ca.js
    • -0
    • +155
    ./resources/tinymce/jscripts/tiny_mce/langs/da.js
    • -0
    • +155
    ./resources/tinymce/jscripts/tiny_mce/langs/de.js
    • -0
    • +158
    ./resources/tinymce/jscripts/tiny_mce/langs/el.js
    • -0
    • +154
    ./resources/tinymce/jscripts/tiny_mce/langs/es.js
    • -0
    • +154
    ./resources/tinymce/jscripts/tiny_mce/langs/et.js
    • -0
    • +154
    ./resources/tinymce/jscripts/tiny_mce/langs/fa.js
    • -0
    • +155
    ./resources/tinymce/jscripts/tiny_mce/langs/fi.js
    • -0
    • +154
    ./resources/tinymce/jscripts/tiny_mce/langs/fr.js
  1. … 712 more files in changeset.
Fixed a couple of typos in daveb's last commit.

Add advanced keys for context menu for all languages

  1. … 19 more files in changeset.
Remove debugging alert statement committed in error

Fix handling of link text in oacslink plugin. Trim spaces off filename

Add keys for contextmenu to the openacs theme.

Remove the oacslink and oacsimage buttons from the default config of the openacs theme.

Allow adding a link without selecting text first.

TinyMCE upgrade changelog moved to changelog.txt

    • -1283
    • +0
    ./resources/tinymce/changelog
    • -0
    • +866
    ./resources/tinymce/changelog.txt
file changelog.txt was initially added on branch oacs-5-5.

    • -0
    • +0
    ./resources/tinymce/changelog.txt
Added missing messages and spanish translation

file es.js was initially added on branch oacs-5-5.

Latest tinymce 3.2.4.1

  1. … 44 more files in changeset.
Language packs for oacs plugins

  1. … 57 more files in changeset.
file fr_dlg.js was initially added on branch oacs-5-5.

file fi_dlg.js was initially added on branch oacs-5-5.

file fa_dlg.js was initially added on branch oacs-5-5.

file et_dlg.js was initially added on branch oacs-5-5.

file es_dlg.js was initially added on branch oacs-5-5.

file el_dlg.js was initially added on branch oacs-5-5.

file en_dlg.js was initially added on branch oacs-5-5.

file zh_dlg.js was initially added on branch oacs-5-5.