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

  1. … 7833 more files in changeset.
- remove unused minified .sj files

- add non-minified files instead were needed

  1. … 15 more files in changeset.
file jquery-1.11.0.js was initially added on branch oacs-5-9.

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. … 517 more files in changeset.
- added plogin syntaxhighlight

- reduced size of default menubar

  1. … 17 more files in changeset.
- update bootstrapck (includes missing skin.js)

  1. … 12 more files in changeset.
file jquery-1.11.0.min.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./js/jquery-1.11.0.min.js
file bootstrapck-sample.html was initially added on branch oacs-5-8.

    • -0
    • +0
    ./bootstrapck-sample.html
file analytics.js was initially added on branch oacs-5-8.

file bootstrapck-sample.css was initially added on branch oacs-5-8.

    • -0
    • +0
    ./css/bootstrapck-sample.css
- adding bootstrap style for ckeditor

  1. … 48 more files in changeset.