• last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2545 more files in changeset.
- Standardize spelling of OpenACS in xo* packages

  1. … 7 more files in changeset.
- improve co-existance with theme-zen

- provide basic support for bootstrap (menubar and datatable, e.g. child-resources)

- new package parameter PreferedCSSToolkit to allow to switch betweeb

yui and bootstrap

- allow menu-definition to contain a dict of extra properties

(e.g. "brand true" for menuButton)

- bump revision to 0.152

  1. … 6 more files in changeset.
- update packaged jquery library

- disable YUI menu-buttons cvs CSS

- deactivate clear in weblog

deactivate clear inside weblog

- upgrade to ckeditor 4.1.2

  1. … 68 more files in changeset.
- initial checking of repeat-procs (repeatable form field items)

  1. … 1 more file in changeset.
- adding ckeditor4

    • -0
    • +120
    ./ckeditor4/CHANGES.md
    • -0
    • +1264
    ./ckeditor4/LICENSE.md
    • -0
    • +39
    ./ckeditor4/README.md
    • -0
    • +138
    ./ckeditor4/build-config.js
    • -0
    • +845
    ./ckeditor4/ckeditor.js
    • -0
    • +38
    ./ckeditor4/config.js
    • -0
    • +103
    ./ckeditor4/contents.css
    • -0
    • +111
    ./ckeditor4/styles.js
    • -0
    • +6
    ./ckeditor4/adapters/jquery.js
  1. … 248 more files in changeset.
Needed to decode list items html since it is used as a JS array index.

- added fresh generated templates

- xowikiimage;

* changed lang text from isolatin1 to utf-8

* updates for xowikiimage plugin for ckeditor support

* added icon image for xowikiimage plugin

- item-refs: added leading .SELF./ for referring to children of the current item

- refactored form-field "file" to fix loosing content and controls,

repeatable, nest-ability; for the time being going back to

version not depending on json code

    • binary
    ./ckeditor/_source/plugins/xowikiimage/images/image.gif
    • -4
    • +6
    ./ckeditor/plugins/xowikiimage/plugin.js
    • binary
    ./ckeditor/plugins/xowikiimage/images/image.gif
    • -1
    • +1
    ./ckeditor/plugins/xowikiimage/lang/de.js
  1. … 12 more files in changeset.
Add version of the external files of the flowplayer to the repository to ease hunting for working versions

    • -0
    • +24
    ./flowplayer/flowplayer-3.2.6.min.js
    • binary
    ./flowplayer/flowplayer-3.2.7.swf
  1. … 1 more file in changeset.
Restoring xowiki code to yesterdays state. Hopefully getting rid of today's unwanted commits.

  1. … 985 more files in changeset.
revert previous two changes

    • binary
    ./wymeditor/skins/twopanels/icons.png
    • -134
    • +0
    ./wymeditor/skins/twopanels/skin.css
    • -39
    • +0
    ./wymeditor/skins/twopanels/skin.js
  1. … 14 more files in changeset.
revert previous change

  1. … 973 more files in changeset.
fix prefixed_lookup to invoke methods on inherited content

  1. … 13 more files in changeset.
repeatable attributes

    • -0
    • +136
    ./wu-repeatable.js
  1. … 3 more files in changeset.
adding sample templates for ckeditor

    • -0
    • +141
    ./ck_templates.js
    • binary
    ./images/1answer.png
    • binary
    ./images/2answers.png
- demangle dependency between jQuery Plugin ckeip and wiki-image functionality

  1. … 1 more file in changeset.
add missing files

    • -0
    • +39
    ./ckeditor/_source/plugins/timestamp/plugin.js
    • -0
    • +51
    ./ckeditor/_source/plugins/xowikiimage/plugin.js
Add missing files

    • binary
    ./ckeditor/_source/plugins/timestamp/images/timestamp.png
    • -0
    • +6
    ./ckeditor/_source/plugins/xowikiimage/lang/de.js
    • -0
    • +5
    ./ckeditor/_source/plugins/xowikiimage/lang/en.js
    • -0
    • +6
    ./ckeditor/_source/plugins/xowikiimage/lang/tr.js
add pluging xowikiimage

    • -0
    • +51
    ./ckeditor/plugins/timestamp/xowikiimage/plugin.js
    • -0
    • +6
    ./ckeditor/plugins/timestamp/xowikiimage/lang/de.js
    • -0
    • +5
    ./ckeditor/plugins/timestamp/xowikiimage/lang/en.js
    • -0
    • +6
    ./ckeditor/plugins/timestamp/xowikiimage/lang/tr.js
Add timestamp plugin

    • -0
    • +39
    ./ckeditor/plugins/timestamp/timestamp/plugin.js
- CKEditor add missing _source/corfile (CVS seems to act wierd, not showing directories as missing)

    • -0
    • +87
    ./ckeditor/_source/core/_bootstrap.js
    • -0
    • +141
    ./ckeditor/_source/core/ckeditor.js
    • -0
    • +227
    ./ckeditor/_source/core/ckeditor_base.js
    • -0
    • +238
    ./ckeditor/_source/core/ckeditor_basic.js
    • -0
    • +209
    ./ckeditor/_source/core/command.js
    • -0
    • +129
    ./ckeditor/_source/core/commanddefinition.js
    • -0
    • +439
    ./ckeditor/_source/core/config.js
    • -0
    • +65
    ./ckeditor/_source/core/dataprocessor.js
    • -0
    • +20
    ./ckeditor/_source/core/dom.js
    • -0
    • +266
    ./ckeditor/_source/core/dtd.js
    • -0
    • +1059
    ./ckeditor/_source/core/editor.js
    • -0
    • +186
    ./ckeditor/_source/core/editor_basic.js
    • -0
    • +305
    ./ckeditor/_source/core/env.js
    • -0
    • +342
    ./ckeditor/_source/core/event.js
    • -0
    • +120
    ./ckeditor/_source/core/eventInfo.js
  1. … 33 more files in changeset.
Extended support for richtext::ckeditor, improved configurability, added inplace (based on work from Michael Totschnig)

    • -0
    • +565
    ./jquery-ui-1.8.17.custom.css
    • -0
    • +356
    ./jquery-ui-1.8.17.custom.min.js
    • binary
    ./images/ui-bg_diagonals-thick_18_b81900_40x40.png
    • binary
    ./images/ui-bg_diagonals-thick_20_666666_40x40.png
    • binary
    ./images/ui-bg_flat_10_000000_40x100.png
    • binary
    ./images/ui-bg_glass_100_f6f6f6_1x400.png
    • binary
    ./images/ui-bg_glass_100_fdf5ce_1x400.png
    • binary
    ./images/ui-bg_glass_65_ffffff_1x400.png
    • binary
    ./images/ui-bg_gloss-wave_35_f6a828_500x100.png
    • binary
    ./images/ui-bg_highlight-soft_100_eeeeee_1x100.png
    • binary
    ./images/ui-bg_highlight-soft_75_ffe45c_1x100.png
    • binary
    ./images/ui-icons_222222_256x240.png
  1. … 16 more files in changeset.
CKeditor 3.6.2

    • -0
    • +47
    ./ckeditor/_source/plugins/a11yhelp/plugin.js
    • -0
    • +222
    ./ckeditor/_source/plugins/a11yhelp/dialogs/a11yhelp.js
    • -0
    • +108
    ./ckeditor/_source/plugins/a11yhelp/lang/en.js
    • -0
    • +216
    ./ckeditor/_source/plugins/a11yhelp/lang/he.js
    • -0
    • +24
    ./ckeditor/_source/plugins/about/plugin.js
    • -0
    • +76
    ./ckeditor/_source/plugins/about/dialogs/about.js
    • binary
    ./ckeditor/_source/plugins/about/dialogs/logo_ckeditor.png
    • -0
    • +228
    ./ckeditor/_source/plugins/adobeair/plugin.js
    • -0
    • +152
    ./ckeditor/_source/plugins/ajax/plugin.js
    • -0
    • +141
    ./ckeditor/_source/plugins/autogrow/plugin.js
    • -0
    • +129
    ./ckeditor/_source/plugins/basicstyles/plugin.js
    • -0
    • +931
    ./ckeditor/_source/plugins/bbcode/plugin.js
    • -0
    • +334
    ./ckeditor/_source/plugins/bidi/plugin.js
    • -0
    • +305
    ./ckeditor/_source/plugins/blockquote/plugin.js
    • -0
    • +290
    ./ckeditor/_source/plugins/button/plugin.js
  1. … 165 more files in changeset.
CKEditor 3.6.2

    • -0
    • +1433
    ./ckeditor/CHANGES.html
    • -0
    • +92
    ./ckeditor/INSTALL.html
    • -0
    • +1327
    ./ckeditor/LICENSE.html
    • -0
    • +955
    ./ckeditor/ckeditor.asp
    • -0
    • +149
    ./ckeditor/ckeditor.js
    • -0
    • +211
    ./ckeditor/ckeditor.pack
    • -0
    • +29
    ./ckeditor/ckeditor.php
    • -0
    • +8
    ./ckeditor/ckeditor_basic.js
    • -0
    • +20
    ./ckeditor/ckeditor_basic_source.js
    • -0
    • +566
    ./ckeditor/ckeditor_php4.php
    • -0
    • +556
    ./ckeditor/ckeditor_php5.php
    • -0
    • +35
    ./ckeditor/ckeditor_source.js
    • -0
    • +11
    ./ckeditor/config.js
    • -0
    • +25
    ./ckeditor/contents.css
    • -0
    • +306
    ./ckeditor/_source/adapters/jquery.js
  1. … 349 more files in changeset.
- add minimalized version

    • -0
    • +18
    ./jquery/jquery.min.js