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

    • -0
    • +10337
    ./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
    ./sample/js/jquery-1.11.0.js
    • -189
    • +0
    ./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
    ./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.
- added plogin syntaxhighlight

- reduced size of default menubar

  1. … 9 more files in changeset.
file locations.json was initially added on branch oacs-5-8.

file icons32.svg was initially added on branch oacs-5-8.

file skin.js was initially added on branch oacs-5-8.

file icons16.svg was initially added on branch oacs-5-8.

- update bootstrapck (includes missing skin.js)

file dialog.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/dialog/dialog.scss
file _config.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/config/_config.scss
file _defaults.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/config/_defaults.scss
file _toolbar.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_toolbar.scss
file _colors.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/config/_colors.scss
file editor.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/editor.scss
file _panel.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_panel.scss
file _richcombo.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_richcombo.scss
file _reset.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_reset.scss
file _presets.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_presets.scss
file _colorpanel.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_colorpanel.scss
file _menu.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_menu.scss
file _mainui.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_mainui.scss
file _elementspath.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/components/_elementspath.scss
file dialog_iequirks.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/browser-specific/iequirks/dialog_iequirks.scss
file dialog_opera.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/browser-specific/opera/dialog_opera.scss
file editor_iequirks.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/browser-specific/iequirks/editor_iequirks.scss
file dialog_ie7.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/browser-specific/ie7/dialog_ie7.scss
file dialog_ie8.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/browser-specific/ie8/dialog_ie8.scss
file editor_ie7.scss was initially added on branch oacs-5-8.

    • -0
    • +0
    ./scss/browser-specific/ie7/editor_ie7.scss