Merge branch 'develop'

massiveart · Nov 10, 2016 · a357c35 · a357c35
2 parents 2f7246b + 759e3ae
commit a357c35
Show file tree

Hide file tree

Showing 14 changed files with 448 additions and 89 deletions.
diff --git a/.grunt/husky.json b/.grunt/husky.json
@@ -21,6 +21,7 @@
             "ckeditor" : "bower_components/ckeditor/ckeditor",
             "sprintf" : "bower_components/sprintf/sprintf",
             "jqueryAdapter" : "bower_components/ckeditor/adapters/jquery",
+            "pasteFromWordPlugin": "husky_components/ckeditor/plugins/paste-from-word/plugin",
             "jquery-minicolors" : "bower_components/jquery-minicolors/jquery.minicolors",
             "husky": "lib/husky",
             "type/husky-select": "husky_components/select/select-type",
@@ -104,6 +105,7 @@
             "__component__$loader@husky": "husky_components/loader/main",
             "__component__$toolbar@husky": "husky_components/toolbar/main",
             "__component__$ckeditor@husky": "husky_components/ckeditor/main",
+            "__component__$ckeditor/plugins/paste-from-word@husky": "husky_components/ckeditor/plugins/paste-from-word/main",
             "__component__$overlay@husky": "husky_components/overlay/main",
             "__component__$label@husky": "husky_components/label/main",
             "__component__$toggler@husky": "husky_components/toggler/main",
@@ -141,6 +143,7 @@
             "ckeditor",
             "sprintf",
             "jqueryAdapter",
+            "pasteFromWordPlugin",
             "html.sortable",
             "uri-template",
             "typeahead",
@@ -173,6 +176,7 @@
             "__component__$column-navigation@husky",
             "__component__$loader@husky",
             "__component__$ckeditor@husky",
+            "__component__$ckeditor/plugins/paste-from-word@husky",
             "__component__$overlay@husky",
             "__component__$label@husky",
             "__component__$toggler@husky",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG for husky
 
+* dev-develop
+    * BUGFIX      #749 Added null check for url-validate
+    * BUGFIX      #745 Fixed clickable ghost pages in column navigation
+    * BUGFIX      #717 Fixed bug with select all/ select none problems and changed design in matrix
+    * BUGFIX      #748 Fixed itembox children remove without existing list
+    * ENHANCEMENT #659 Added own implementation for paste-from-word plugin
+
 * 0.27.0 (2016-11-03)
     * FEATURE     #728 Added actionOnGhostPage option in column navigation
     * BUGFIX      #724 Removed bug with displaced multifield remove icon

diff --git a/dist/husky.css b/dist/husky.css
@@ -9634,17 +9634,26 @@ a.btn-black, a.btn-highlight {
   border: none;
   white-space: nowrap;
 }
-/* line 29, ../scss/modules/matrix.scss */
+/* line 28, ../scss/modules/matrix.scss */
+.table.matrix td.value > span:last-child {
+  display: none;
+  padding-left: 3px;
+}
+/* line 35, ../scss/modules/matrix.scss */
+.table.matrix td.value:hover > span:last-child {
+  display: inline;
+}
+/* line 40, ../scss/modules/matrix.scss */
 .table.matrix td.all {
   text-align: left;
   padding-left: 16px;
   color: #000;
 }
-/* line 34, ../scss/modules/matrix.scss */
+/* line 45, ../scss/modules/matrix.scss */
 .table.matrix td.section {
   color: #999;
 }
-/* line 39, ../scss/modules/matrix.scss */
+/* line 50, ../scss/modules/matrix.scss */
 .table.matrix .matrix-icon {
   border: 1px solid #000;
   color: #000;
@@ -9656,7 +9665,7 @@ a.btn-black, a.btn-highlight {
   display: inline-block;
   text-align: center;
 }
-/* line 52, ../scss/modules/matrix.scss */
+/* line 63, ../scss/modules/matrix.scss */
 .table.matrix .matrix-icon.is-active {
   color: #fff;
   border-color: #5DC774;