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

  1. … 7834 more files in changeset.
Standardize spelling of names of products (Tcl, AOLserver, PostgreSQL, NaviServer)

  1. … 43 more files in changeset.
- adding nonce values to script tags

  1. … 11 more files in changeset.
- add nonce to inline javascript

- don't use dashes ("-") in namespaces

  1. … 7 more files in changeset.
- initialize variable ::template::util::richtext::editors for cases, where no richtext editor is registered

- provide a plugin interface for richtext editors

- bump version number to 5.9.1d2

  1. … 1 more file in changeset.
- check result of regepx before assuming a match variable is set

- prefer ns_quotehtml over ad_quotehtml

  1. … 36 more files in changeset.
- add editor hints to keep spaces/tabs in the furture more consistent

  1. … 754 more files in changeset.
- fix braces in javascript for ckeditor4

- 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.