Merge branch 'release/10.5' into dev

Gemfile.lock

@@ -10,8 +10,8 @@ GIT
 
 GIT
   remote: https://github.com/finnlabs/omniauth-openid_connect-providers.git
-  revision: 8c93ea9a197d4142e20af17e5ad3088d6893f7ab
+  revision: 5148dd402cacc2785cee76336d649ebdf84488ca
-  ref: 8c93ea9a197d4142e20af17e5ad3088d6893f7ab
+  ref: 5148dd402cacc2785cee76336d649ebdf84488ca
   specs:
     omniauth-openid_connect-providers (0.1.1)
       omniauth-openid-connect (>= 0.2.1)

Gemfile.modules

@@ -10,7 +10,7 @@ end
 
 gem 'omniauth-openid_connect-providers',
 		git: 'https://github.com/finnlabs/omniauth-openid_connect-providers.git',
-		ref: '8c93ea9a197d4142e20af17e5ad3088d6893f7ab'
+		ref: '5148dd402cacc2785cee76336d649ebdf84488ca'
 
 gem 'omniauth-openid-connect',
 		git: 'https://github.com/finnlabs/omniauth-openid-connect.git',

app/assets/stylesheets/content/editor/_ckeditor.sass

@@ -101,6 +101,10 @@ ckeditor-augmented-textarea .op-ckeditor--wrapper
     border-top-left-radius: 0
     border-top-right-radius: 0
 
+    .document-editor__editable
+      .-large-height &
+        min-height: 250px
+
   .ck-editor__editable
     padding: 1cm 2cm 2cm
     border: 1px hsl( 0,0%,82.7% ) solid

app/seeders/demo_data/project_seeder.rb

@@ -168,8 +168,9 @@ module DemoData
     end
 
     def seed_news(project, key)
+      user = User.admin.first
       Array(project_data_for(key, 'news')).each do |news|
-        News.create! project: project, title: news[:title], summary: news[:summary], description: news[:description]
+        News.create! project: project, author: user, title: news[:title], summary: news[:summary], description: news[:description]
       end
     end
 

app/views/types/form/_settings.html.erb

@@ -56,7 +56,7 @@ See docs/COPYRIGHT.rdoc for more details.
       </div>
     <% end %>
 
-    <div class="form--field">
+    <div class="form--field -wide-label -large-height">
       <%= f.text_area :description,
                       class: 'wiki-edit wiki-toolbar',
                       container_class: '-xxwide',

config/locales/js-en.yml

@@ -292,7 +292,7 @@ en:
             current_new_feature_html: >
               The release contains various new features and improvements: <br><br>
               <ul>
-                <li><b>Action board for assignees</b>: create action boards that will automatically update the assignee when moving cards accross lists.</li>
+                <li><b>Action board for assignees</b>: create action boards that will automatically update the assignee when moving cards across lists.</li>
                 <li>Sort versions by name not by dates which makes it much easier to select a version from the list.</li>
                 <li><b>Remove 24-hour restriction</b> for time tracking.</li>
                 <li>Show news summary on project overview widget.</li>

docs/development/product-development-handbook/README.md

@@ -9,7 +9,7 @@ keywords: product development, requirement process
 
 <h1>OpenProject Product Development Handbook</h1>
 
-[toc]
+
 
 ## 1. Overview & Objectives
 
@@ -129,7 +129,7 @@ The RICE scoring model aims to objectively evaluate requirements (new products,
 
 
 
-<u>**Reach**</u>
+**Reach**
 
 The first factor when determining the RICE score is the number of users reached by the feature.
 For OpenProject, Reach refers to the number of users and customers who will benefit from a new requirement in the first quarter after its launch.
@@ -140,7 +140,7 @@ Data sources to estimate this may include queries and user data of an associated
 
 
 
-<u>**Impact**</u>
+**Impact**
 
 The second numerator is Impact which refers to the benefits for users and customers Impact can refer to quantitative measures, such as conversion improvements, increased revenue, decreased risk or decreased cost or to qualitative measures, such as increasing customer delight.
 This makes it possible to compare revenue generating opportunities to non-revenue generating opportunities.
@@ -151,7 +151,7 @@ The higher the impact, the higher the RICE score.
 
 
 
-<u>**Confidence**</u>
+**Confidence**
 
 Especially for more complex requirements it may be unclear what the reach, impact or effort is. The team may rely more on intuition for a factor. To account for this uncertainty, the confidence component is used.
 
@@ -163,7 +163,7 @@ If you arrive at a confidence level below 50%, consider this requirement a “Mo
 
 
 
-<u>**Effort**</u>
+**Effort**
 
 The three aforementioned factors (Reach, Impact, Confidence) represent the numerators of the RICE score. The effort score refers to the estimated resources (product, design, engineering, quality assurance, etc.) in person-months needed to implement a feature.
 

docs/release-notes/10-5-0/README.md

@@ -5,14 +5,89 @@ sidebar_navigation:
 release_version: 10.5.0
 release_date: 2020-04-23
 ---
+---
+# Release notes OpenProject 10.5.0
+
+| Release notes                                                | Description                                                  |
+| ------------------------------------------------------------ | :----------------------------------------------------------- |
+| [OpenProject 10.5.0](#openproject-1050)                      | What is new for OpenProject 10.5.0?                          |
+| [OpenProject 10.5 BIM Edition for construction project management](#openproject-105-bim-edition-for-construction-project-management) | What is new for the construction project management for the building industry in OpenProject 10.5.0? |
+
 
 # OpenProject 10.5.0
 
 We released [OpenProject 10.5.0](https://community.openproject.com/versions/1386).
-The release contains several bug fixes and we recommend updating to the newest version.
+The new release of the open source project management software contains new action boards for assignees, much more intuitive sorting of versions by name, the removed 24-hours booking restriction for time tracking, the summary of news on the project over view page, and much more usability improvements and bug fixes.
+
+We recommend updating to the newest version.
 
 <!--more-->
-#### Bug fixes and changes
+
+### Action board for assignees
+
+The new action boards for assignees allow to create agile boards with lists for individual users or groups. The assignee will automatically be updated when moving cards across lists. This allows very transparent prioritization of tasks and distribution of workload between individuals and teams.
+
+![Assignee-boards](Assignee-boards.png)
+
+### Sort versions by name
+
+We have now changed the sorting of versions in the drop-down menu by name not by dates. This makes it much easier to select a version from the list, especially when there are multiple active versions in one project.
+
+![Sorting-versions](Sorting-versions.png)
+
+### No more 24-hour restriction for time tracking
+
+The restriction to only allow the booking of 24 hours per day has now been removed. You can now summarize your time bookings and track more than 24 hours.
+
+![Spent-time](Spent-time.png)
+
+### Show news summary on project overview widget
+
+The summary of news will now be displayed in the news widget on the project overview page. This way, the summary of the most recent news will be communicated at one sight.
+
+![news-summary](news-summary.png)
+
+## Upgrade to the OpenProject Enterprise Edition
+
+With OpenProject 10.5 it is now much easier to upgrade an existing Community installation to the Enterprise Edition. Within your system Administration under -> Enterprise Edition you now have the possibility to start a 14 days free trial for the Enterprise Edition. Also, you can upgrade directly to get professional support, premium features, and additional security features. The Enterprise token will be generated and updated in your Community installation.
+
+ ![Enterprise-Edition-upgrade](Enterprise-Edition-upgrade.png)
+
+## OpenProject 10.5 BIM Edition for construction project management
+
+OpenProject BIM 10.5 will improvement BIM project management for the construction industry, especially with the support of the BIM Collaboration Format (BCF). With the BCF Management module, the OpenProject BIM Edition now offers a fast and intuitive form of central collaboration and coordination in your BIM projects. Release 10.4 has already added an IFC Viewer for the integration of 3D building models. Now, BCF issues can be created directly in the 3D model and managed centrally.
+
+### Collaboration and coordination in one central BIM project management software
+
+OpenProject supports BIM project management with central planning, collaboration and coordination for BIM projects. The software thus connects all project participants in a web-based system. As a web-based coordination tool, all BIM issues can be created, managed and distributed centrally in OpenProject.
+
+![BCF-management](BCF-management.png)
+
+### BCF Management for the construction industry
+
+The core scenario enabled by the new release of the BIM Edition is BIM Issue Management with BCF. This enables issues in a construction project (e.g. clashes, requests, questions) to be crated and communicated directly on a 3D model or between several submodels.
+Both, model-associated issues (BCFs) directly on the BIM model as well as non-model-associated tasks can be created and tracked.
+
+![BCF-management-details](BCF-management-details.png)
+
+### Central BCF issue management and BCF communication in OpenProject
+
+The BCF Issue management and communication is thus done centrally in OpenProject. Issues can be created directly on the 3D building model, jointly prioritized and analyzed, and assigned to the responsible BIM modelers.
+
+OpenProject offers an ideal way to comment on and track BCFs. Powerful filter and search functions support fast and intuitive use and transparent tracking.
+
+ ![BCF-management-split-screen-details](BCF-management-split-screen-details.png)
+
+### Support of open formats IFC and BCF
+
+BCF Management in OpenProject is compatible with hundreds of applications that support the exchange formats IFC (Industry Foundation Classes) and BCF (BIM Collaboration Format).
+
+### Robust BCF import and export
+
+BIM Issues can be created wherever the user identifies them, i.e. in his favorite BIM tool. These issues can then be easily imported into OpenProject - the central BCF management system - for centralized tracking and consolidation.
+An export function can then be used to distribute the BCFs back to the local applications.
+
+### All changes and bug fixes
 
 - Changed: Hide "Empty" work package updates  \[[#21471](https://community.openproject.com/wp/21471)\]
 - Changed: Create a "Action board" with "Action attribute" -> "Assignee" \[[#30157](https://community.openproject.com/wp/30157)\]
@@ -113,4 +188,4 @@ A big thanks to community members for reporting bugs and helping us identifying
 
 Special thanks for reporting and finding bugs go to
 
-Vikas Kedia, Fernando Meurer, Aurelien Barre, Adnan Abou-Rikab, Scott Sanders, York-Simon Johannsen, Joachim Schardt, Peter Pof, Tobias R, Frank Schmid, Harald Holzmann, Petr Zeman, Paul GARROUSTE, Marc Vollmer, Filter Punk, Mathias Gerlach, Gio @ Enuan, Per Bröms, Jason Culligan, Frank Long, Radovan Semancik, Frendy A. N.
+Vikas Kedia, Fernando Meurer, Aurelien Barre, Adnan Abou-Rikab, Scott Sanders, York-Simon Johannsen, Joachim Schardt, Peter Pof, Tobias R, Frank Schmid, Harald Holzmann, Petr Zeman, Paul GARROUSTE, Marc Vollmer, Filter Punk, Mathias Gerlach, Gio @ Enuan, Per Bröms, Jason Culligan, Frank Long, Radovan Semancik, Frendy A. N.

docs/release-notes/README.md

@@ -12,6 +12,12 @@ Stay up to date and get an overview of the new features included in the releases
 <!--- New release notes are generated below. Do not remove comment. -->
 <!--- RELEASE MARKER -->
 
+## 10.5.0
+
+Release date: 2020-04-23
+
+[Release Notes](10-5-0/)
+
 ## 10.4.1
 
 Release date: 2020-03-04

docs/system-admin-guide/users-permissions/users/README.md

@@ -81,13 +81,13 @@ In the top right, click the **Send invitation** button in order to send the emai
 
 ## View user profile
 
-If you want to see the user profile, click on the user name in the user list to display the activities accross all projects from a certain user. Click the **Profile** button on the top right of a user.
+If you want to see the user profile, click on the user name in the user list to display the activities across all projects from a certain user. Click the **Profile** button on the top right of a user.
 
 ![Sys-admin-profile](Sys-admin-profile.png)
 
 
 
-You will see all the Activities accross all projects from this user, as well as the amount of reported work packages in the system.
+You will see all the Activities across all projects from this user, as well as the amount of reported work packages in the system.
 
 ![user profile](image-20200115162109669.png)
 

docs/user-guide/projects/README.md

@@ -25,7 +25,7 @@ Your projects can be available publicly or internally. OpenProject does not limi
 | [Delete a project](#delete-a-project)                        | How to delete a project?                                     |
 | [View all projects](#view-all-projects)                      | Get an overview of all your projects in the project overview list. |
 | [Create a project template](#create-a-project-template)      | You can create a project template and use it for future projects. |
-| [Project overarching reports](#project-overarching-reports)  | How to create project overarching reports accross multiple projects? |
+| [Project overarching reports](#project-overarching-reports)  | How to create project overarching reports across multiple projects? |
 
 ## Select a project
 

frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts

@@ -111,6 +111,10 @@ export class OpenprojectBcfModule {
 
     const hookService = injector.get(HookService);
     hookService.register('prependedAttributeGroups', (workPackage:WorkPackageResource) => {
+      if (!window.OpenProject.isBimEdition) {
+        return;
+      }
+
       if (workPackage.isNew) {
         return BcfNewWpAttributeGroupComponent;
       } else {

lib/open_project/version.rb

@@ -34,7 +34,7 @@ module OpenProject
   module VERSION #:nodoc:
     MAJOR = 10
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
     TINY  = PATCH # Redmine compat
 
     class << self

modules/bim/spec/features/bcf/api_authorization_spec.rb

@@ -28,7 +28,10 @@
 
 require 'spec_helper'
 
-describe 'authorization for BCF api', type: :feature, js: true do
+describe 'authorization for BCF api',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let!(:user) { FactoryBot.create(:admin) }
   let(:client_secret) { app.plaintext_secret }
   let(:scope) { 'bcf_v2_1' }

modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-describe 'BCF snapshot column', type: :feature, js: true, with_mail: false do
+describe 'BCF snapshot column',
+         type: :feature,
+         js: true,
+         with_config: { edition: 'bim' },
+         with_mail: false do
   let(:project) { FactoryBot.create(:project, enabled_module_names: %w[bim work_package_tracking]) }
   let(:wp_table) { Pages::WorkPackagesTable.new(project) }
   let(:permissions) { %i[add_work_packages view_work_packages view_linked_issues] }

modules/bim/spec/features/bcf/create_spec.rb

@@ -1,6 +1,10 @@
 require_relative '../../spec_helper'
 
-describe 'Create BCF', type: :feature, js: true, with_mail: false do
+describe 'Create BCF',
+         type: :feature,
+         js: true,
+         with_config: { edition: 'bim' },
+         with_mail: false do
   let(:project) do
     FactoryBot.create(:project,
                       types: [type, type_with_cf],

modules/bim/spec/features/bcf/export_spec.rb

@@ -28,7 +28,10 @@
 require 'spec_helper'
 require_relative '../../support/pages/ifc_models/show_default'
 
-describe 'bcf export', type: :feature, js: true do
+describe 'bcf export',
+         type: :feature,
+         js: true,
+         with_config: { edition: 'bim' } do
   let(:status) { FactoryBot.create(:status, name: 'New', is_default: true) }
   let(:closed_status) { FactoryBot.create(:closed_status, name: 'Closed') }
   let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }

modules/bim/spec/features/bim_filter_spec.rb

@@ -31,7 +31,10 @@ require 'spec_helper'
 require_relative '../support/pages/ifc_models/show'
 require_relative '../support/pages/ifc_models/show_default'
 
-describe 'BIM filter spec', type: :feature, js: true do
+describe 'BIM filter spec',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: %w(bim work_package_tracking) }
   let(:open_status) { FactoryBot.create(:status, is_closed: false) }
   let(:closed_status) { FactoryBot.create(:status, is_closed: true) }

modules/bim/spec/features/bim_navigation_spec.rb

@@ -28,7 +28,10 @@
 
 require_relative '../spec_helper'
 
-describe 'BIM navigation spec', type: :feature, js: true do
+describe 'BIM navigation spec',
+         type: :feature,
+         with_config: { edition: 'bim' },
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let!(:work_package) { FactoryBot.create(:work_package, project: project) }
   let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_ifc_models view_work_packages]) }

modules/bim/spec/features/model_management_spec.rb

@@ -30,7 +30,10 @@ require 'spec_helper'
 
 require_relative '../support/pages/ifc_models/index'
 
-describe 'model management', type: :feature, js: true do
+describe 'model management',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
   let(:index_page) { Pages::IfcModels::Index.new(project) }
   let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_bcf manage_ifc_models view_work_packages]) }

modules/bim/spec/features/model_viewer_spec.rb

@@ -28,7 +28,10 @@
 
 require_relative '../spec_helper'
 
-describe 'model viewer', type: :feature, js: true do
+describe 'model viewer',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   # TODO: Add empty viewpoint and stub method to load viewpoints once defined
   let(:work_package) { FactoryBot.create(:work_package, project: project) }

modules/bim/spec/features/show_default_spec.rb

@@ -28,7 +28,10 @@
 
 require_relative '../spec_helper'
 
-describe 'show default model', type: :feature, js: true do
+describe 'show default model',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
   let(:index_page) { Pages::IfcModels::Index.new(project) }
   let(:show_default_page) { Pages::IfcModels::ShowDefault.new(project) }

modules/bim/spec/features/viewer/create_viewpoint_spec.rb

@@ -28,7 +28,10 @@
 
 require_relative '../../spec_helper'
 
-describe 'Create viewpoint from BCF details page', type: :feature, js: true do
+describe 'Create viewpoint from BCF details page',
+         type: :feature,
+         with_config: { edition: 'bim' },
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let(:user) { FactoryBot.create :admin }
 

modules/bim/spec/features/viewer/delete_viewpoint_spec.rb

@@ -28,7 +28,10 @@
 
 require_relative '../../spec_helper'
 
-describe 'Delete viewpoint in model viewer', type: :feature, js: true do
+describe 'Delete viewpoint in model viewer',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let(:user) { FactoryBot.create :admin }
 

modules/bim/spec/features/viewer/show_viewpoint_spec.rb

@@ -28,7 +28,10 @@
 
 require_relative '../../spec_helper'
 
-describe 'Show viewpoint in model viewer', type: :feature, js: true do
+describe 'Show viewpoint in model viewer',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let(:user) { FactoryBot.create :admin }