From 7a3a51194875502fd00d9e4d23d5e87557d80d34 Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 13 Jan 2017 11:13:02 +0100 Subject: [PATCH 1/2] Started 4.7.1 development. --- CHANGES.md | 2 ++ dev/builder/build.sh | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 784217a11b9..ceb77b31e26 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ CKEditor 4 Changelog ==================== +## CKEditor 4.7.1 + ## CKEditor 4.7 ## CKEditor 4.6.2 diff --git a/dev/builder/build.sh b/dev/builder/build.sh index 05f0b4883a4..4c2796f5f66 100755 --- a/dev/builder/build.sh +++ b/dev/builder/build.sh @@ -57,7 +57,7 @@ echo "Starting CKBuilder..." JAVA_ARGS=${ARGS// -t / } # Remove -t from args. -VERSION="4.7.0 DEV" +VERSION="4.7.1 DEV" REVISION=$(git rev-parse --verify --short HEAD) SEMVER_REGEX="^([0-9]+)\.([0-9]+)\.([0-9]+)(\-[0-9A-Za-z-]+)?(\+[0-9A-Za-z-]+)?$" diff --git a/package.json b/package.json index fd822d63890..bb734aaa213 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ckeditor-dev", - "version": "4.7.0", + "version": "4.7.1", "description": "The development version of CKEditor - JavaScript WYSIWYG web text editor.", "devDependencies": { "benderjs-coverage": "^0.2.1", From 95d0afa8cacf0f2e79f5aadae546f40ea03911e1 Mon Sep 17 00:00:00 2001 From: knusperpixel Date: Thu, 6 Apr 2017 17:25:38 +0200 Subject: [PATCH 2/2] Docblock for getCss has a typo In line 129 it said " Returns a string will all CSS rules passed" - I thought that might be a typo, so I fixed it. --- core/ckeditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ckeditor.js b/core/ckeditor.js index 2756204464a..95dd67ac0c7 100644 --- a/core/ckeditor.js +++ b/core/ckeditor.js @@ -126,7 +126,7 @@ CKEDITOR.remove = function( editor ) { }; /** - * Returns a string will all CSS rules passed to the {@link CKEDITOR#addCss} method. + * Returns a string with all CSS rules passed to the {@link CKEDITOR#addCss} method. * * @returns {String} A string containing CSS rules. */