• last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
- fix typo

- streamline spelleck (sub)widget of richtext between different modes, fix one more label occurance

- don't let <label> contain <input> fields, end the label text before it.

The original version has bad effects on e.g. bootstrap, which sets

a font-property for <label>, which is afterwards as well used for input fields.

  1. … 1 more file in changeset.
- provide minimal support for ckeditor4 (via CDN)

- added changes from antonio to pass handling for unknown editor to the master templates

  1. … 2 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2547 more files in changeset.
- normalize string expressions

  1. … 12 more files in changeset.
- replace "eval" by expand operator

  1. … 11 more files in changeset.
don't qoute boolean vars when initializing tinymce init params

fix for bug in tinymce init code regarding booleans

Added doc section to the richtext to_sql proc.

Added a couple of template validation procedures ("added a couple of

templating system datatypes") to bring the kernel and templating system's

view of datatypes closer together. Added to_sql/from_sql helpers to move

that functionality from ad_form into the templating system.

  1. … 2 more files in changeset.
Merged 5.5.1 to HEAD

  1. … 181 more files in changeset.
remove html security check bypass for admins in the richtext validation per OCT discussion

Close LABEL tag before adding the Format and Spellcheck widgets. This HTML should be build in the template rather than in the rendering proc. Each widget should be computed separately.

Non-info file merge results, with conflicts fixed

  1. … 726 more files in changeset.
Removed plugins from the default config of tinymce since they need acs-templating to be mounted and it's not by default. Rolling back to be xinha the default editor.

  1. … 1 more file in changeset.
Updated template::widget::richtext doc to include tinymce

Add per widget config for tinymce.

Allow only valid elements and attributes in tinymce

  1. … 1 more file in changeset.
Remove zoom plugin. Fix permissions on file plugin on xinha

  1. … 1 more file in changeset.
Bump version number, add tinymce default config parameter

  1. … 1 more file in changeset.
quick refactor to the chrome bug fix victor did, at some point we'll need to eliminate this entry

- extend OacsFS plugin to insert wiki links, if wiki_p is specified

- handle passing of wiki_p

  1. … 3 more files in changeset.
- add script_dir to list of exported variables for xinha

Checking for Chrome user-agent in a more explicit way.

Hack in checks for support of xinha depending on the user-agent versions,

there was a problem when the user-agent was chrome.

Set default to "openacs" for tinymce

Fixed HTML

Tinymce:

- fixed typo

- fix to retrieve htmlarea_id elements for tinymce initialization

Indent code