• last updated 10 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging back to HEAD all changes that happened in branch oacs-5-8 between tags: vg-merge-oacs-5-8-from-20141027 and vg-merge-oacs-5-8-from-20150427

  1. … 513 more files in changeset.
- upgrade ckeditor 4 from 4.1 to version 4.4.7

- added global parameter PreferredRichtextEditor to allow easy choice between xinha (default), ckeditor, ckeditor4 or wym (in case, editor= is not specified for the form field)

- bumped version number to 0.158

  1. … 267 more files in changeset.
- upgrade to ckeditor 4.1.2

  1. … 82 more files in changeset.
- adding ckeditor4

    • -0
    • +187
    ./dialog/dialog.html
    • -0
    • +48
    ./dialog/assets/my_dialog.js
    • -0
    • +103
    ./enterkey/enterkey.html
    • -0
    • +280
    ./htmlwriter/outputforflash.html
    • -0
    • +237
    ./htmlwriter/outputhtml.html
    • -0
    • +148
    ./htmlwriter/assets/outputforflash/outputforflash.fla
    • binary
    ./htmlwriter/assets/outputforflash/outputforflash.swf
    • -0
    • +18
    ./htmlwriter/assets/outputforflash/swfobject.js
    • -0
    • +207
    ./magicline/magicline.html
    • -0
    • +232
    ./toolbar/toolbar.html
    • -0
    • +77
    ./wysiwygarea/fullpage.html
  1. … 252 more files in changeset.