• last updated 16 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
backporting fix from oacs-5-8.

typo: missing ).

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.
- strip traling whitespace

  1. … 1 more file in changeset.
- don't load ckeditor for repeated fields repeatedly, since this can bloat the browser (many thanks to Markus Moser for the patch)

  1. … 1 more file in changeset.
- fix visibility for repeated control "add another"

- update jquery to version 1.11.2

- don't show "add another" when maximum of repeatable entries is reached

- make labels for adding and removing items configurable

  1. … 1 more file in changeset.
file syntaxhighlight.js was initially added on branch oacs-5-8.

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

- reduced size of default menubar

    • binary
    ./ckeditor4/plugins/icons_hidpi.png
    • -1
    • +1
    ./ckeditor4/skins/bootstrapck/editor.css
  1. … 3 more files in changeset.
file locations.json was initially added on branch oacs-5-8.

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

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

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

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

    • -1
    • +1
    ./ckeditor4/skins/bootstrapck/editor.css
    • binary
    ./ckeditor4/skins/bootstrapck/icons.png
    • -0
    • +10
    ./ckeditor4/skins/bootstrapck/skin.js
- added full configuration for ckeditor

added flash plugin

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

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

file handle.png was initially added on branch oacs-5-8.

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

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

file template1.gif was initially added on branch oacs-5-8.

file wink_smile.png was initially added on branch oacs-5-8.

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

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

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

file wink_smile.gif was initially added on branch oacs-5-8.

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

file tounge_smile.gif was initially added on branch oacs-5-8.

    • binary
    ./ckeditor4/plugins/smiley/images/tounge_smile.gif