• last updated 13 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
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. … 520 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2547 more files in changeset.
- fix message key

- more cleanup

- comment out ds_comment statements

Restoring xowiki code to yesterdays state. Hopefully getting rid of today's unwanted commits.

  1. … 999 more files in changeset.
revert previous change

  1. … 987 more files in changeset.
- cleanup for ckeditor changes

  1. … 4 more files in changeset.
Extended support for richtext::ckeditor, improved configurability, added inplace (based on work from Michael Totschnig)

  1. … 30 more files in changeset.