Merge branch 'dev'

bin/Editor.css

@@ -51,4 +51,11 @@
 }
 
 div.cke_panel.cke_combopanel.cke_ltr { width: 300px !important; }
-span.cke_rcombo span.cke_styles a span span.cke_text { width: 150px; }
+span.cke_rcombo span.cke_styles a span span.cke_text { width: 150px; }
\ No newline at end of file
+
+.cke_notifications_area {
+    position: absolute;
+    top: 50% !important;
+    left: 50% !important;
+    z-index: 999999 !important;
+}

bin/backend/controls/UploadWindow.js

@@ -57,7 +57,7 @@ define('package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow', [
             var Content = this.getContent();
 
             this.$Upload = new UploadForm({
-                multible    : false,
+                multiple    : false,
                 sendbutton  : false,
                 cancelbutton: false,
                 events      : {

composer.json

@@ -16,7 +16,7 @@
     },
     "require": {
         "quiqqer\/quiqqer": "*",
-        "quiqqer\/qui": ">=1|dev-master|dev-dev",
+        "quiqqer\/qui": ">=1|*@dev",
         "ckeditor\/ckeditor": "4.10.*"
     },
     "autoload": {
@@ -25,4 +25,4 @@
             "QUI\\Ckeditor\\Plugins\\": "src\/QUI\/Ckeditor\/Plugins\/"
         }
     }
-}
+}
\ No newline at end of file

plugins/activePlugins.json

@@ -39,7 +39,6 @@
   "smiley",
   "sourcedialog",
   "specialchar",
-  "stylesheetparser",
   "table",
   "tableresize",
   "tabletools",
@@ -51,4 +50,4 @@
   "xml",
   "youtube",
   "zoom"
-]
+]
\ No newline at end of file