Merge branch 'release/12.2' into dev

config/locales/js-en.yml

@@ -173,7 +173,7 @@ en:
           language_hint: 'Enter the formatting language that will be used for highlighting (if supported).'
         dropdown:
           macros: 'Macros'
-          chose_macro: 'Chose macro'
+          chose_macro: 'Choose macro'
         toc: 'Table of contents'
         toolbar_help: 'Click to select widget and show the toolbar. Double-click to edit widget'
         wiki_page_include:

docs/development/contribution-documentation/documentation-process/README.md

@@ -112,6 +112,10 @@ In the same drop down click on "New branch". In this window **insert a branch na
 
 ![create new branch - step 2](create-new-branch-step-2.png)
 
+After that Publish your branch to the forked remote repository on github.com.
+
+![create new branch - step 3](create-new-branch-step-3.png)
+
 
 
 ## Step 11: Open the files you want to change in Typora
@@ -144,7 +148,7 @@ A pull request is a workflow to ask for a review from the OpenProject team. With
 
 
 
-Here select the latest release branch e.g. `release/12.2` in the **"base:"** dropdown on the left side. In the **"compare:"** dropdown select the branch you have changed.
+Your Pull Request will be created in the browser **on github.com** Here select the latest release branch e.g. `release/12.2` in the **"base:"** dropdown on the left side. In the **"compare:"** dropdown select the branch you have changed.
 
 ![create pull request](create-pull-request.png)
 

docs/user-guide/nextcloud-integration/README.md

@@ -9,7 +9,7 @@ keywords: integrations, apps, Nextcloud
 
 # Nextcloud integration
 
-Starting with OpenProject 12.2, you can now use [Nextcloud](https://nextcloud.com/), the world’s most-deployed on-premises collaborative file storage platform, together with [OpenProject](https://www.openproject.org/), the leading free and open source project management and collaboration software. **Data sovereignty** and **open source** are important core values to both OpenProject and Nextcloud, and form the foundational common ground for this integration.
+Starting with OpenProject 12.2, you can now use [Nextcloud](https://nextcloud.com/), the world’s most-deployed on-premises collaborative file storage platform, together with [OpenProject](https://www.openproject.org/), the leading free and open source project management software. **Data sovereignty** and **open source** are important core values to both OpenProject and Nextcloud, and form the foundational common ground for this integration.
 
 This integration allows you to link files and folders in Nextcloud with work packages in OpenProject, which makes it possible see all files related to a work package (in Open Project) and all work packages related to a file (in Nextcloud). As a project member, you no longer need to lose time time trying to find the right files to be able to complete your tasks, and the integration of OpenProject-specific notifications on Nextcloud dashboard ensures that no change goes unnoticed. 
 
@@ -29,7 +29,7 @@ The integration enables you to perform multiple actions in both Nextcloud and Op
 
 The following video gives you a short overview of how to use this integration:
 
-![OpenProject Nextcloud integration video](https://openproject-docs.s3.eu-central-1.amazonaws.com/videos/video_filename.mp4)
+![OpenProject Nextcloud integration video](https://openproject-docs.s3.eu-central-1.amazonaws.com/videos/OpenProject-Nextcloud-Integration-2.mp4)
 
 As a user of both Nextcloud and OpenProject, you can benefit from this integration in both platforms:
 

docs/user-guide/work-packages/work-packages-faq/README.md

@@ -73,16 +73,15 @@ One possible solution: If you receive this error message when trying to create a
 
 You can change this in your account settings. Please find out more [here](../../../getting-started/my-account/#change-the-order-to-display-comments).
 
-### Why are changes on parent work packages which are triggered by changes to child work packages not aggregated?
+### Why are changes on parent work packages which are triggered by making changes to a child work package not aggregated? 
 
 OpenProject aggregates work package activities only if:
 
 - They are within the defined time frame
-
 - Are made by the same user
 - If at most one comment is part of the aggregate (because it is hard to merge two bodies of text)
 
-As an inherited change is always commented ("Updated automatically by...") they can basically never be aggregated.
+As an inherited change is always commented ("Updated automatically by...") they can not be aggregated.
 
 ### How can I fill/populate the position field/column for work packages?
 

frontend/src/app/features/in-app-notifications/center/in-app-notification-center-page.component.ts

@@ -100,7 +100,8 @@ export class InAppNotificationCenterPageComponent extends UntilDestroyedMixin im
 
   ngOnInit():void {
     this.documentReferer = document.referrer;
-    this.titleService.prependFirstPart(this.text.title);
+
+    this.setInitialHtmlTitle();
 
     this.removeTransitionSubscription = this.$transitions.onSuccess({}, ():any => {
       this.titleService.setFirstPart(this.text.title);
@@ -131,4 +132,21 @@ export class InAppNotificationCenterPageComponent extends UntilDestroyedMixin im
   // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
   changeChangesFromTitle(val:string):void {
   }
+
+  private setInitialHtmlTitle():void {
+    const currentTitleParts = this.titleService.titleParts;
+
+    // Prepend "Notifications" if only the application name is shown
+    if (currentTitleParts.length === 1) {
+      this.titleService.prependFirstPart(this.text.title);
+    }
+
+    // A click on the left side menu of the notification center newly triggers the center page (and thus the ngOnInit).
+    // So the transition hook only works for changing the content of the split screen but not when switching for example
+    // from "watched" to "mentioned".
+    // So we override the first part in this case to make sure that there is not the name of a WP is shown when there is no split screen visible.
+    if (currentTitleParts[0] !== this.text.title) {
+      this.titleService.setFirstPart(this.text.title);
+    }
+  }
 }