Merge remote-tracking branch 'origin/release/10.5' into dev

app/assets/stylesheets/content/work_packages/timelines/elements/_labels.sass

@@ -1,8 +1,10 @@
 @mixin timeline-label
+  display: flex
+  align-items: center
   height: 16px
   min-width: 20px
+  width: max-content
   font-size: 14px
-  display: inline-block
   white-space: nowrap
   vertical-align: middle
   pointer-events: none
@@ -33,7 +35,7 @@
     left: 0px
     top: 0px
     // Then translate by its own width + some margin
-    transform: translateX(calc(-100% - 10px))
+    transform: translateX(calc(-100% - 15px))
     // Ensure line-height is normal
     line-height: 1
 

app/views/attribute_help_texts/index.html.erb

@@ -26,7 +26,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See docs/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: t(:'attribute_help_texts.label_plural') %>
+<% name = 'WorkPackage' %>
+
+<%= toolbar title: t(:'attribute_help_texts.label_plural') do %>
+  <li class="toolbar-item">
+    <%= link_to new_attribute_help_text_path(name: name),
+                { class: 'attribute-help-texts--create-button button -alt-highlight',
+                  aria: {label: t(:'attribute_help_texts.add_new')},
+                  title: t(:'attribute_help_texts.add_new')} do %>
+      <%= op_icon('button--icon icon-add') %>
+      <span class="button--text"><%= t('activerecord.models.attribute_help_text') %></span>
+    <% end %>
+  </li>
+<% end %>
 
 <div class="notification-box -info">
   <div class="notification-box--content">
@@ -35,7 +47,6 @@ See docs/COPYRIGHT.rdoc for more details.
 </div>
 
 <% html_title(t(:label_administration), t(:'attribute_help_texts.label_plural')) -%>
-<% name = 'WorkPackage' %>
 
 <% entries = @texts_by_type[name] || [] %>
 <% if entries.any? %>
@@ -105,13 +116,3 @@ See docs/COPYRIGHT.rdoc for more details.
 <% else %>
   <%= no_results_box %>
 <% end %>
-
-<div class="generic-table--action-buttons">
-  <%= link_to new_attribute_help_text_path(name: name),
-              { class: 'attribute-help-texts--create-button button -alt-highlight',
-                aria: {label: t(:'attribute_help_texts.add_new')},
-                title: t(:'attribute_help_texts.add_new')} do %>
-    <%= op_icon('button--icon icon-add') %>
-    <span class="button--text"><%= t('activerecord.models.attribute_help_text') %></span>
-  <% end %>
-</div>

docs/enterprise-edition-guide/README.md

@@ -16,7 +16,7 @@ The Enterprise Edition builds on top of the free Community Edition. An upgrade i
 | ------------------------------------------------------------ | :----------------------------------------------------------- |
 | [Enterprise Edition trial](#create-an-enterprise-edition-trial) | Can I test the Enterprise Edition for free?                  |
 | [Activate the Enterprise Edition](#activate-the-enterprise-edition) | How can I upgrade my Community Edition to an Enterprise Edition? |
-| [Installation support](installation-support)                 | How can I get installation support?                          |
+| [Installation support](#installation-support)                 | How can I get installation support?                          |
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/YRF_bavXBts" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 

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

@@ -17,7 +17,7 @@ release_date: 2020-04-23
 # OpenProject 10.5.0
 
 We released [OpenProject 10.5.0](https://community.openproject.com/versions/1386).
-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.
+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 overview page, and much more usability improvements and bug fixes.
 
 We recommend updating to the newest version.
 

docs/release-notes/6-1-1/README.md

@@ -54,10 +54,8 @@ OpenProject 6.1.1 contains several bug fixes and improvements.
         [\#24334](https://community.openproject.com/projects/openproject/work_packages/24334/activity),
         [\#24335](https://community.openproject.com/projects/openproject/work_packages/24335/activity),
         [\#24339](https://community.openproject.com/projects/openproject/work_packages/24339/activity),
-        [\#24341](https://community.openproject.com/projects/costs-plugin/work_packages/24341/activity),
         [\#24372](https://community.openproject.com/projects/openproject/work_packages/24372/activity),
-        [\#24373](https://community.openproject.com/projects/openproject/work_packages/24373/activity),
-        [\#24367](https://community.openproject.com/projects/plugin-reporting/work_packages/24367/activity)).
+        [\#24373](https://community.openproject.com/projects/openproject/work_packages/24373/activity)).
 
 Thanks a lot to the community, in particular to Marc Vollmer, Markus
 Hillenbrand, Nicolai Daniel and Christophe Mornet for [reporting

docs/release-notes/6-1-5/README.md

@@ -20,8 +20,7 @@ your OpenProject installation to this version.
 ## Bug fixes (11)
 
   - On the packaged installation the “Send iCalendar” button in meetings
-    caused an error
-    ([\#24445](https://community.openproject.com/projects/plugin-meetings/work_packages/24445/activity)).
+    caused an error.
   - The breadcrumb was partially hidden when following the link to
     activities
     ([\#24477](https://community.openproject.com/projects/openproject/work_packages/24477/activity)).

frontend/src/app/modules/bim/ifc_models/ifc-viewer/ifc-viewer.component.html

@@ -16,7 +16,7 @@
   </div>
 
   <div class="ifc-model-viewer--container xeokit-busy-modal-backdrop">
-    <div *ngIf="!keyboardEnabled"
+    <div *ngIf="modelCount && !keyboardEnabled"
          class="ifc-model-viewer--focus-warning">
       <a class="ifc-model-viewer--keyboard-disabled-icon icon-no-color icon-input-disabled"
          (mousedown)="enableFromIcon($event)"

frontend/src/app/modules/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts

@@ -47,9 +47,7 @@ import {I18nService} from "core-app/modules/common/i18n/i18n.service";
 })
 export class IFCViewerComponent implements OnInit, OnDestroy {
   private viewerUI:any;
-
-  modelCount = this.ifcData.models.length;
-
+  modelCount:number;
   canManage = this.ifcData.allowed('manage_ifc_models');
 
   text = {
@@ -65,11 +63,13 @@ export class IFCViewerComponent implements OnInit, OnDestroy {
 
   constructor(private I18n:I18nService,
               private elementRef:ElementRef,
-              private ifcData:IfcModelsDataService,
+              public ifcData:IfcModelsDataService,
               private ifcViewer:IFCViewerService) {
   }
 
   ngOnInit():void {
+    this.modelCount = this.ifcData.models.length;
+
     if (this.modelCount === 0) {
       return;
     }
@@ -94,13 +94,15 @@ export class IFCViewerComponent implements OnInit, OnDestroy {
 
   @HostListener('mousedown')
   enableKeyBoard() {
-    this.keyboardEnabled = true;
-    this.ifcViewer.setKeyboardEnabled(true);
+    if (this.modelCount) {
+      this.keyboardEnabled = true;
+      this.ifcViewer.setKeyboardEnabled(true);
+    }
   }
 
   @HostListener('window:mousedown', ['$event.target'])
   disableKeyboard(target:Element) {
-    if (!this.outerContainer.nativeElement!.contains(target)) {
+    if (this.modelCount && !this.outerContainer.nativeElement!.contains(target)) {
       this.keyboardEnabled = false;
       this.ifcViewer.setKeyboardEnabled(false);
     }

frontend/src/app/modules/boards/board/board.service.ts

@@ -25,7 +25,7 @@ export class BoardService {
   private text = {
     unnamed_board: this.I18n.t('js.boards.label_unnamed_board'),
     action_board: (attr:string) => this.I18n.t('js.boards.board_type.action_by_attribute',
-      { attribute: attr }),
+      { attribute: this.I18n.t('js.boards.board_type.action_type.' + attr )}),
     unnamed_list: this.I18n.t('js.boards.label_unnamed_list'),
   };
 

frontend/src/app/modules/boards/index-page/boards-index-page.component.ts

@@ -29,7 +29,7 @@ export class BoardsIndexPageComponent extends UntilDestroyedMixin implements OnI
     type: this.I18n.t('js.boards.label_board_type'),
     type_free: this.I18n.t('js.boards.board_type.free'),
     action_by_attribute: (attr:string) => this.I18n.t('js.boards.board_type.action_by_attribute',
-      { attribute: attr }),
+      { attribute: this.I18n.t('js.boards.board_type.action_type.' + attr ) }),
     createdAt: this.I18n.t('js.label_created_on'),
     delete: this.I18n.t('js.button_delete'),
     areYouSure: this.I18n.t('js.text_are_you_sure'),

modules/boards/config/locales/js-en.yml

@@ -43,6 +43,10 @@ en:
         action_text: >
           Create a board with filtered lists on a single attribute. Moving work packages to other lists
           will update their attribute.
+        action_type:
+          assignee: assignee
+          status: status
+          version: version
         select_attribute: "Action attribute"
 
       configuration_modal: