Merge branch 'develop'

.grunt/husky.json

@@ -32,6 +32,8 @@
             "services/husky/mediator": "husky_services/mediator",
             "services/husky/translator": "husky_services/translator",
             "services/husky/url-validator": "husky_services/url-validator",
+            "services/husky/logger": "husky_services/logger",
+            "services/husky/expression": "husky_services/expression",
 
             "bootstrap-datepicker": "bower_components/bootstrap-datepicker/bootstrap-datepicker",
             "datepicker-ar": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.az",

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG for husky
 
+* dev-develop
+    * FEATURE     #728 Added actionOnGhostPage option in column navigation
+    * BUGFIX      #724 Removed bug with displaced multifield remove icon
+    * BUGFIX      #746 Considered mime type when adding image to dropzone
+    * ENHANCEMENT #742 Extracted expression into a service
+    * BUGFIX      #744 Removed default placeholder for datepicker
+    * ENHANCEMENT #741 Change logo by overwritable variable in navigation
+    * BUGFIX      #734 Adapted overlays to match grid system
+
 * 0.26.0 (2016-10-06)
     * FEATURE     #737 Added possibility to define overlay spacing for each slide
     * BUGFIX      #738 Removed action icon in datagrid if no icon is defined

UPGRADE.md

@@ -2,6 +2,13 @@
 
 ## 0.26.0
 
+### Overlay skins
+
+The overlays have been fixed to match the grid system. Therefore the `wide`
+skin was replaced by a `small`, `medium` and `large` skin. The old one was
+removed, because all the widths were changed and overlays have to be
+reconsidered anyway.
+
 ### Lock and Unlocking the dropzone overlay
 
 The behaviour of the overlay in the dropzone got slightly changed.