• last updated 8 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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)

    • -0
    • +99
    ./xinha-nightly/contrib/compress.php
    • -0
    • +107
    ./xinha-nightly/contrib/compress_yui.php
    • -0
    • +178
    ./xinha-nightly/contrib/lc_merge_strings.php
    • -1
    • +12
    ./xinha-nightly/contrib/php-xinha.php
    • -0
    • +61
    ./xinha-nightly/contrib/test_server.py
    • binary
    ./xinha-nightly/contrib/yuicompressor-2.4.2.jar
    • -3
    • +134
    ./xinha-nightly/examples/XinhaConfig.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

Non-info file merge results, with conflicts fixed

    • -1
    • +1
    ./tinymce/jscripts/tiny_mce/tiny_mce.js
    • -337
    • +581
    ./tinymce/jscripts/tiny_mce/tiny_mce_src.js
    • -0
    • +154
    ./tinymce/jscripts/tiny_mce/langs/bg.js
    • -0
    • +154
    ./tinymce/jscripts/tiny_mce/langs/ca.js
    • -0
    • +155
    ./tinymce/jscripts/tiny_mce/langs/da.js
    • -0
    • +155
    ./tinymce/jscripts/tiny_mce/langs/de.js
    • -0
    • +158
    ./tinymce/jscripts/tiny_mce/langs/el.js
    • -0
    • +154
    ./tinymce/jscripts/tiny_mce/langs/es.js
    • -0
    • +154
    ./tinymce/jscripts/tiny_mce/langs/et.js
    • -0
    • +154
    ./tinymce/jscripts/tiny_mce/langs/fa.js
    • -0
    • +155
    ./tinymce/jscripts/tiny_mce/langs/fi.js
    • -0
    • +154
    ./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.
Fix handling of link text in oacslink plugin. Trim spaces off filename

  1. … 1 more file in changeset.
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

file changelog.txt was initially added on branch oacs-5-5.

    • -0
    • +0
    ./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
    • +1
    ./tinymce/jscripts/tiny_mce/tiny_mce.js
    • -337
    • +581
    ./tinymce/jscripts/tiny_mce/tiny_mce_src.js
  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.

    • -0
    • +0
    ./tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
file zh_dlg.js was initially added on branch oacs-5-5.

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

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

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