Merge remote-tracking branch 'origin/dev' into feature/configurable-query-modal

app/assets/javascripts/application.js.erb

@@ -29,6 +29,7 @@
 //= require i18n
 
 //= require ./bundles/openproject-vendors
+//= require ./bundles/openproject-common
 //= require ./bundles/openproject-core-app
 //= require_tree ./bundles
 

app/assets/stylesheets/content/_modal.sass

@@ -236,7 +236,8 @@ ul.export-options
 .wp-table--configuration-modal
   min-height: 120px
   max-height: 90vh
-  width: 75vh
+  width: 50vw
+  overflow-x: auto
 
   label.option-label
     float: left
@@ -246,3 +247,11 @@ ul.export-options
 
   .modal--form-actions
     margin: 1em 0
+
+  .advanced-filters--filter,
+  .advanced-filters--add-filter
+    max-width: 100%
+
+@include breakpoint (680px down)
+  .wp-table--configuration-modal
+    width: 90vw

app/assets/stylesheets/layout/_breadcrumb.sass

@@ -105,9 +105,6 @@ ul.breadcrumb
       &:first-child
         &:before
           display: none
-      &.icon-arrow-right5:before
-        padding-right: 8px
-
 
 // This is ugly. However, this way we do not need to touch complicated
 // toolbar-container positioning.

frontend/.gitignore

@@ -8,6 +8,7 @@
 /tests/unit/tests/typescript
 /tmp
 
+/tests/openproject-common.js
 /tests/openproject-test-bundle.js
 /tests/openproject-main.css
 /tests/openproject-tests.css

frontend/app/components/work-packages/wp-breadcrumb/wp-breadcrumb.html

@@ -2,14 +2,14 @@
      *ngIf="workPackage && workPackage.ancestors.length > 0">
   <ul class="breadcrumb">
     <li *ngFor="let ancestor of workPackage.ancestors"
-        class="icon-context icon-small icon-arrow-right5">
+        class="icon4 icon-small icon-arrow-right5">
       <a [attr.title]="ancestor.name"
          [textContent]="ancestor.name"
          uiSref="work-packages.show.activity"
          [uiParams]="{workPackageId: ancestor.id}"
          class="breadcrumb-project-title nocut"></a>
     </li>
-    <li class="icon-context icon-small icon-arrow-right5"
+    <li class="icon4 icon-small icon-arrow-right5"
         [textContent]="workPackage.name"></li>
   </ul>
 </div>

frontend/karma.conf.js

@@ -55,6 +55,7 @@ module.exports = function (config) {
       'tests/unit/tests/asset_functions.js',
 
       '../app/assets/javascripts/bundles/openproject-vendors.js',
+      '../app/assets/javascripts/bundles/openproject-common.js',
 
       'tests/openproject-test-bundle.js',
 

frontend/webpack-main-config.js

@@ -217,6 +217,13 @@ function getWebpackMainConfig() {
     },
 
     plugins: [
+      // added to avoid module-duplication with plugins
+      new webpack.optimize.CommonsChunkPlugin({
+        name: "common",
+        filename: "openproject-common.js",
+        minChunks: 2
+      }),
+
       // Add a simple fail plugin to return a status code of 2 if
       // errors are detected (this includes TS warnings)
       // It is ONLY executed when `ENV[CI]` is set or `--bail` is used.

script/ci_setup.sh

@@ -68,6 +68,7 @@ else
   # fake result of npm/asset run
   run "mkdir -p app/assets/javascripts/bundles"
   run "touch app/assets/javascripts/bundles/openproject-core-app.js"
+  run "touch app/assets/javascripts/bundles/openproject-common.js"
   run "touch app/assets/javascripts/bundles/openproject-vendors.js"
   run "mkdir -p app/assets/javascripts/locales"
   run "touch app/assets/javascripts/locales/en.js"