• last updated 5 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. … 519 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. … 273 more files in changeset.
- adding ckeditor4

    • -0
    • +20
    ./dialogs/options.js
    • -0
    • +71
    ./dialogs/toolbar.css
  1. … 259 more files in changeset.