• last updated 19 mins 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. … 516 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. … 270 more files in changeset.
- upgrade to ckeditor 4.1.2

    • -0
    • +127
    ./dialogs/tmp.html
  1. … 79 more files in changeset.
- adding ckeditor4

    • -0
    • +49
    ./dialogs/ciframe.html
    • -0
    • +52
    ./dialogs/tmpFrameset.html
  1. … 257 more files in changeset.