• last updated 15 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. … 506 more files in changeset.
file refresh.png was initially added on branch oacs-5-8.

    • binary
    ./images/refresh.png
    • binary
    ./images/hidpi/refresh.png
file close.png was initially added on branch oacs-5-8.

    • binary
    ./images/hidpi/close.png
file lock-open.png was initially added on branch oacs-5-8.

    • binary
    ./images/lock-open.png
    • binary
    ./images/hidpi/lock-open.png
file lock.png was initially added on branch oacs-5-8.

    • binary
    ./images/hidpi/lock.png
file icons_hidpi.png was initially added on branch oacs-5-8.

  1. … 1 more file 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. … 260 more files in changeset.
- upgrade to ckeditor 4.1.2

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

  1. … 248 more files in changeset.