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

    • -0
    • +10337
    ./skins/bootstrapck/sample/js/jquery-1.11.0.js
  1. … 7833 more files in changeset.
- remove unused minified .sj files

- add non-minified files instead were needed

    • -0
    • +10337
    ./skins/bootstrapck/sample/js/jquery-1.11.0.js
    • -189
    • +0
    ./skins/bootstrapck/sample/js/jquery-1.11.0.min.js
  1. … 15 more files in changeset.
file jquery-1.11.0.js was initially added on branch oacs-5-9.

    • -0
    • +0
    ./skins/bootstrapck/sample/js/jquery-1.11.0.js
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 syntaxhighlight.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./plugins/syntaxhighlight/dialogs/syntaxhighlight.js
- added plogin syntaxhighlight

- reduced size of default menubar

    • -1
    • +1
    ./skins/bootstrapck/editor_iequirks.css
  1. … 3 more files in changeset.
file locations.json was initially added on branch oacs-5-8.

    • -0
    • +0
    ./skins/bootstrapck/dev/locations.json
file icons32.svg was initially added on branch oacs-5-8.

    • -0
    • +0
    ./skins/bootstrapck/dev/icons32.svg
file skin.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./skins/bootstrapck/skin.js
file icons16.svg was initially added on branch oacs-5-8.

    • -0
    • +0
    ./skins/bootstrapck/dev/icons16.svg
- update bootstrapck (includes missing skin.js)

    • -1
    • +1
    ./skins/bootstrapck/editor_iequirks.css
    • binary
    ./skins/bootstrapck/icons_hidpi.png
    • -0
    • +683
    ./skins/bootstrapck/dev/icons16.svg
    • -0
    • +694
    ./skins/bootstrapck/dev/icons32.svg
    • -0
    • +140
    ./skins/bootstrapck/dev/locations.json
    • -2
    • +2
    ./skins/bootstrapck/sample/js/analytics.js
- added full configuration for ckeditor

added flash plugin

    • binary
    ./plugins/flash/images/placeholder.png
file flash.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./plugins/flash/dialogs/flash.js
file template3.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/templates/templates/images/template3.gif
file handle.png was initially added on branch oacs-5-8.

    • binary
    ./plugins/widget/images/handle.png
file default.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./plugins/templates/templates/default.js
file template2.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/templates/templates/images/template2.gif
file template1.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/templates/templates/images/template1.gif
file wink_smile.png was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/wink_smile.png
file templates.js was initially added on branch oacs-5-8.

    • -0
    • +0
    ./plugins/templates/dialogs/templates.js
file templates.css was initially added on branch oacs-5-8.

    • -0
    • +0
    ./plugins/templates/dialogs/templates.css
file whatchutalkingabout_smile.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/whatchutalkingabout_smile.gif
file wink_smile.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/wink_smile.gif
file whatchutalkingabout_smile.png was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/whatchutalkingabout_smile.png
file tounge_smile.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/tounge_smile.gif
file thumbs_up.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/thumbs_up.gif
file tongue_smile.png was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/tongue_smile.png
file tongue_smile.gif was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/tongue_smile.gif
file thumbs_up.png was initially added on branch oacs-5-8.

    • binary
    ./plugins/smiley/images/thumbs_up.png