Skip to content

Commit

Permalink
update TinyMCE to 4.7.13
Browse files Browse the repository at this point in the history
  • Loading branch information
erral committed Sep 14, 2018
1 parent d07d596 commit 59c5efa
Show file tree
Hide file tree
Showing 576 changed files with 169,582 additions and 236,844 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Expand Up @@ -15,6 +15,11 @@ Breaking changes:
which is a backward compatibilit package only, or also update to not depend on it anymore.
[jensens]

New features:

- Update TinyMCE to 4.7.13
[erral]

- New browser view based login code - merged from plone.login (credits to esteele, pbauer, agitator, jensens, et al).
`portal_skins/plone_login` is now gone, see PLIP #2092.
Also, password reset view moved to login subfolder to keep things together.
Expand Down
4 changes: 2 additions & 2 deletions Products/CMFPlone/profiles/dependencies/registry.xml
Expand Up @@ -1071,7 +1071,7 @@
<value key="js">++plone++static/components/jquery.recurrenceinput.js/lib/jquery.tmpl.js</value>
<value key="deps">jquery</value>
</records>

<!-- legacy js -->
<record name="plone.resources.last_legacy_import">
<field type="plone.registry.field.Datetime">
Expand Down Expand Up @@ -1187,7 +1187,7 @@
<value key="expression">python: member is not None</value>
<value key="jscompilation">++plone++static/plone-logged-in-compiled.min.js</value>
<value key="csscompilation">++plone++static/plone-logged-in-compiled.css</value>
<value key="last_compilation">2018-07-10 00:00:00</value>
<value key="last_compilation">2018-09-14 00:00:00</value>
<value key="depends">plone</value>
<value key="stub_js_modules">
<element>backbone</element>
Expand Down
2 changes: 1 addition & 1 deletion Products/CMFPlone/static/bower.json
Expand Up @@ -46,7 +46,7 @@
"requirejs-text": "2.0.15",
"select2": "3.5.4",
"selectivizr": "1.0.2",
"tinymce-builded": "4.5.6",
"tinymce-builded": "4.7.13",
"requirejs": "",
"less": "2.1.2",
"r.js": "2.1.15",
Expand Down
1 change: 1 addition & 0 deletions Products/CMFPlone/static/components/ace-builds/editor.html
Expand Up @@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Editor</title>
<style type="text/css" media="screen">
body {
Expand Down
1 change: 1 addition & 0 deletions Products/CMFPlone/static/components/backbone/index.html
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<meta name="viewport" content="width=device-width">
<link rel="canonical" href="http://backbonejs.org" />
<title>Backbone.js</title>
Expand Down
6 changes: 3 additions & 3 deletions Products/CMFPlone/static/components/requirejs/require.js
@@ -1,5 +1,5 @@
/** vim: et:ts=4:sw=4:sts=4
* @license RequireJS 2.3.5 Copyright jQuery Foundation and other contributors.
* @license RequireJS 2.3.6 Copyright jQuery Foundation and other contributors.
* Released under MIT license, https://github.com/requirejs/requirejs/blob/master/LICENSE
*/
//Not using strict: uneven strict support in browsers, #392, and causes
Expand All @@ -11,7 +11,7 @@ var requirejs, require, define;
(function (global, setTimeout) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
version = '2.3.5',
version = '2.3.6',
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
Expand Down Expand Up @@ -165,7 +165,7 @@ var requirejs, require, define;
* @returns {Error}
*/
function makeError(id, msg, err, requireModules) {
var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
var e = new Error(msg + '\nhttps://requirejs.org/docs/errors.html#' + id);
e.requireType = id;
e.requireModules = requireModules;
if (err) {
Expand Down

This file was deleted.

0 comments on commit 59c5efa

Please sign in to comment.