Skip to content
Permalink
Browse files

Merge branch 't/11830'

  • Loading branch information...
adelura committed Jun 16, 2014
2 parents e8e46f3 + 9c2338f commit a8fe4687a6f3719b60ab54173d975256c3bd7067
Showing with 3 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +2 −2 dev/builder/build.sh
@@ -13,6 +13,7 @@ New Features:

Fixed Issues:

* [#11830](http://dev.ckeditor.com/ticket/11830): Fixed: Issue with passing arguments into CKBuilder.
* [#11757](http://dev.ckeditor.com/ticket/11757): Fixed: Imperfections in the [Moono](http://ckeditor.com/addon/moono) skin. Thanks to [danyaPostfactum](https://github.com/danyaPostfactum)!
* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to adapter configuration.
@@ -9,7 +9,7 @@ set -e
echo "CKBuilder - Builds a release version of ckeditor-dev."
echo ""

CKBUILDER_VERSION="1.7.2"
CKBUILDER_VERSION="2.0.1"
CKBUILDER_URL="http://download.cksource.com/CKBuilder/$CKBUILDER_VERSION/ckbuilder.jar"

PROGNAME=$(basename $0)
@@ -57,7 +57,7 @@ echo "Starting CKBuilder..."

JAVA_ARGS=${ARGS// -t / } # Remove -t from arrgs

java -jar ckbuilder/$CKBUILDER_VERSION/ckbuilder.jar --build ../../ release --version="4.4.2 DEV" --build-config build-config.js --overwrite "$JAVA_ARGS"
java -jar ckbuilder/$CKBUILDER_VERSION/ckbuilder.jar --build ../../ release --version="4.4.2 DEV" --overwrite $JAVA_ARGS

# Copy and build tests
if [[ "$ARGS" == *\ \-t\ * ]]; then

0 comments on commit a8fe468

Please sign in to comment.
You can’t perform that action at this time.