Skip to content

[pull] dev from opf:dev #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 3, 2025
6 changes: 3 additions & 3 deletions config/locales/crowdin/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2854,13 +2854,13 @@ de:
prefix: "Erhalten aufgrund Benachrichtigungseinstellung: %{reason}"
date_alert_start_date: "Datums-Erinnerung"
date_alert_due_date: "Datums-Erinnerung"
reminder: "Reminder"
reminder: "Erinnerung"
see_all: "Alle anzeigen"
updated_at: "Aktualisiert %{timestamp} von %{user} "
reminder_notifications:
subject: "Reminder: %{note}"
subject: "Erinnerung: %{note}"
heading: "You have a new reminder"
note: "Note: “%{note}”"
note: "Anmerkung: “%{note}”"
sharing:
work_packages:
allowed_actions: "Sie haben auf diesem Arbeitspakte folgende Berechtigungen: %{allowed_actions}. Dies kann sich je nach Ihrer Projektrolle und Berechtigungen ändern."
Expand Down
8 changes: 4 additions & 4 deletions docs/api/apiv3/tags/basic_objects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ description: |-
* It *must not* include HTML or other kind of markup
* Error messages form complete sentences including punctuation

##### Example
#### Example

```json
{
Expand Down Expand Up @@ -214,7 +214,7 @@ description: |-

If the *Formattable* is marked as **read only**, the `raw` attribute also becomes **read only**.

##### Example
### Example

```json
{
Expand Down Expand Up @@ -248,7 +248,7 @@ description: |-
Colors are represented in RGB using hexadecimal notation as specified in [CSS Color Module Level 3](https://www.w3.org/TR/css3-color/).
That is a `#` followed by either three or six hexadecimal digits.

##### Example
### Example

```
red: #ff0000 or #f00
Expand All @@ -270,7 +270,7 @@ description: |-
| algorithm | The algorithm used to compute the digest | String | md5 |
| hash | The calculated digest in hexadecimal notation | String | 64c26a8403cd796ea4cf913cda2ee4a9 |

##### Example
### Example

```json
{
Expand Down
12 changes: 6 additions & 6 deletions docs/api/apiv3/tags/schemas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ description: |-

The `_dependencies` property contains the list of dependencies that exist between the value selected for one of the properties of the described resource and the resource's structure. Depending on the value, additional properties might exist or properties might have other values allowed to be assigned. See [SchemaDependency](https://www.openproject.org/docs/api/endpoints/schemas/#schema-dependencies) for more information.

# Field schema
## Field schema

## Linked Properties
### Linked Properties

| Property | Description | Conditions |
| :--------------: | -------------------------------------------------------------- | --------------------------------------------- |
Expand All @@ -39,7 +39,7 @@ description: |-

Only one of the links (`allowedValues`, `allowedValuesSchemas`) will exist for any given property.

## Local Properties
### Local Properties

| Property | Description | Type | Default |
|:-----------------:| ---------------------------------------------------------------------------------- | ------------ | ------- |
Expand Down Expand Up @@ -72,7 +72,7 @@ description: |-
property set to `_links`. This means that the `user` property will be found under the path
`_links.user` of the json payload of the work package resource.

# Schema Dependencies
## Schema Dependencies

A `SchemaDependency` describes the dependencies between a value chosen for a resource's property
and the resource's structure. By that, additional properties or changes in a property are
Expand All @@ -89,11 +89,11 @@ description: |-

SchemaDependencies are always embedded inside a Schema's `_dependencies` attribute. As such, they are not independently existing resources. Consequently, they do not have a `self` reference.

## Linked Properties
### Linked Properties

A SchemaDependency does not have any links.

## Local Properties
### Local Properties

| Property | Description | Type |
| :-----------------: | ---------------------------------------------------------------------------------- | ---------------- |
Expand Down
6 changes: 3 additions & 3 deletions docs/development/development-environment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ keywords: development setup
| [MacOS](macos) | Develop setup on MacOS |


### Start Coding
## Start Coding

Please have a look at [our development guidelines](../code-review-guidelines/) for tips and guides on how to start
coding. We have advice on how to get your changes back into the OpenProject core as smooth as possible.
Also, take a look at the `doc` directory in our sources, especially
the [how to run tests](../running-tests) documentation (we like to have automated tests for every new developed feature).

### Troubleshooting
## Troubleshooting

The OpenProject logfile can be found in `log/development.log`.

If an error occurs, it should be logged there (as well as in the output to STDOUT/STDERR of the rails server process).

### Questions, Comments, and Feedback
## Questions, Comments, and Feedback

If you have any further questions, comments, feedback, or an idea to enhance this guide, please tell us at the
appropriate [forum](https://community.openproject.org/projects/openproject/boards/9).
4 changes: 2 additions & 2 deletions docs/glossary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ The quick context menu in OpenProject opens when you open a [work package table]

## Relations

In OpenProject, you can set work packages in relation to each other. Some relation types simply create a visible link between the two work packages. Others have an additional effect, e.g. force one work package to be finished before the other one starts (Predecessor). The simpliest way to add a relation between two existing work packages is to click the +Relation button on the Relations tab of one of the work packages. [Read more about work package relations and hierarchies in our user guide](../user-guide/work-packages/work-package-relations-hierarchies/).
In OpenProject, you can set work packages in relation to each other. Some relation types simply create a visible link between the two work packages. Others have an additional effect, e.g. force one work package to be finished before the other one starts (Predecessor). The simplest way to add a relation between two existing work packages is to click the +Relation button on the Relations tab of one of the work packages. [Read more about work package relations and hierarchies in our user guide](../user-guide/work-packages/work-package-relations-hierarchies/).

## Repository

Expand Down Expand Up @@ -492,4 +492,4 @@ WYSIWYG stands for 'What you see is what you get'. A WYSIWYG editor is a content

### Zen mode

In OpenProject, Zen mode allows users to focus on a certain page, as all other menu items and elements are hidden, and the page is displayed in full screen. OpenProject offers zen mode for other modules like work packages, boards, Gantt charts, calendars, and project lists.
In OpenProject, Zen mode allows users to focus on a certain page, as all other menu items and elements are hidden, and the page is displayed in full screen. OpenProject offers zen mode for other modules like work packages, boards, Gantt charts, calendars, and project lists.
5 changes: 2 additions & 3 deletions docs/release-notes/13-4-2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ Release date: 2024-05-22
We released [OpenProject 13.4.2](https://community.openproject.org/versions/2058).
The release contains several bug fixes and we recommend updating to the newest version.

### Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
## Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)

OpenProject Cost Report functionality uses improper sanitization of user input. This can lead to Stored XSS via the header values of the report table. This attack requires the permissions "Edit work packages" as well as "Add attachments".

For more information, [please see our security advisory](https://github.com/opf/openproject/security/advisories/GHSA-h26c-j8wg-frjc).

<!--more-->

## Bug fixes and changes

<!-- Warning: Anything within the below lines will be automatically removed by the release script -->
Expand Down
3 changes: 2 additions & 1 deletion docs/release-notes/14-0-2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ Release date: 2024-05-22
We released [OpenProject 14.0.2](https://community.openproject.org/versions/2057).
The release contains several bug fixes and we recommend updating to the newest version.

### Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
## Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)

OpenProject Cost Report functionality uses improper sanitization of user input. This can lead to Stored XSS via the header values of the report table. This attack requires the permissions "Edit work packages" as well as "Add attachments".

For more information, [please see our security advisory](https://github.com/opf/openproject/security/advisories/GHSA-h26c-j8wg-frjc).
Expand Down
3 changes: 2 additions & 1 deletion docs/release-notes/14-1-0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ We released [OpenProject 14.1.0](https://community.openproject.org/versions/2030
## Important updates and breaking changes

### Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)

OpenProject Cost Report functionality uses improper sanitization of user input. This can lead to Stored XSS via the header values of the report table. This attack requires the permissions "Edit work packages" as well as "Add attachments".

For more information, [please see our security advisory](https://github.com/opf/openproject/security/advisories/GHSA-h26c-j8wg-frjc).
Expand Down Expand Up @@ -175,7 +176,7 @@ Apart from the features mentioned above, there have been a lot of other changes,
<!-- END AUTOMATED SECTION -->
<!-- Warning: Anything above this line will be automatically removed by the release script -->

#### Contributions
## Contributions

A very special thank you goes to our sponsors for features and improvements of this release:

Expand Down
21 changes: 12 additions & 9 deletions docs/system-admin-guide/authentication/openid-providers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ keywords: OpenID providers
> [!IMPORTANT]
> OpenID Connect providers is an Enterprise add-on. If you do not see the button you will have to activate the Enterprise edition first.

| Topic | Content |
| ------------------------------------------------------------ | ------------------------------------------------------------ |
| Login with [Google Workspace](#google) | How to use Google Workspace as an SSO provider for OpenProject? |
| [Microsoft Entra ID](#microsoft-entra) (previously Azure) | How to use Microsoft Azure Active Directory as an SSO provider for OpenProject? |
| [Custom OpenID Connect Providers](#custom-openid-connect-provider) | Configuration of additional OpenID Connect providers. |
| [Troubleshooting](#troubleshooting) | Common complications when using OpenID as SSO. |
| Topic | Content |
|--------------------------------------------------------------------|---------------------------------------------------------------------------------|
| Login with [Google Workspace](#google) | How to use Google Workspace as an SSO provider for OpenProject? |
| [Microsoft Entra ID](#microsoft-entra) (previously Azure) | How to use Microsoft Azure Active Directory as an SSO provider for OpenProject? |
| [Custom OpenID Connect Providers](#custom-openid-connect-provider) | Configuration of additional OpenID Connect providers. |
| [Troubleshooting](#troubleshooting) | Common complications when using OpenID as SSO. |

To activate and configure OpenID providers in OpenProject, navigate to *Administration* -> *Authentication* and choose -> *OpenID providers*.

Expand Down Expand Up @@ -77,7 +77,6 @@ You can create different kinds of providers with a different set of properties.
After pressing **CREATE** you will see a following pop-up window.

> [!TIP]
>
> Make sure to note your **Client ID** and **Client Secret**.

![OAuth client created](g5-oauth-client-created.png)
Expand All @@ -100,7 +99,9 @@ Press **Finish setup** to save the client and complete. If you go back to the in

## Microsoft Entra

### Step 1: Register an App in Azure Active Directory
### Step-by-step

#### Step 1: Register an App in Azure Active Directory

If your organization currently has an Azure Active Directory to manage users, and you want to use that to log in to OpenProject, you will need to register a new *App*.

Expand Down Expand Up @@ -149,7 +150,7 @@ The steps are as follows:

9. A secret should have been generated and will be displayed on the page.

> [!IMPORTANT]
> [!IMPORTANT]
> Make sure to save it because it will only be displayed once.

![Azure Active Directory Add Secret](08-add-secret.png)
Expand Down Expand Up @@ -188,6 +189,8 @@ To start creating a custom provider, please follow these steps:
- **Click** the green *+ OpenID Connect provider* button
- **Choose** the *Option* **Custom**

### Step-by-step

#### Step 1: Display name

- Set a **Display Name**, this is the name of the login button shown to users. Let's assume we're trying to connect *Keycloak* with OpenProject for this example. We will type in Keycloak as that's the label of the button to be shown to users trying to authenticate.
Expand Down
5 changes: 2 additions & 3 deletions docs/system-admin-guide/authentication/recaptcha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sidebar_navigation:
title: reCAPTCHA
priority: 600
description: configure reCAPTCHA for OpenProject.
keywords: reCAPTCHA
keywords: reCAPTCHA, turnstile
---
# reCAPTCHA configuration

Expand All @@ -21,8 +21,7 @@ You can configure the following options:

![reCAPTCHA authentication settings in OpenProject administration](openproject_system_admin_guide_recaptcha.png)


# Cloudflare Turnstile configuration
## Cloudflare Turnstile configuration

To use Cloudflare Turnstile with OpenProject, you need to configure the reCAPTCHA settings in the Cloudflare dashboard. Please see the following link for more details on Cloudflare Turnstile and how to configure it: [https://developers.cloudflare.com/turnstile/](https://developers.cloudflare.com/turnstile/).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def expected_entry_row(t_entry, with_times_column)
def expected_entry_columns(t_entry, with_times_column)
time_column = generator.format_spent_on_time(t_entry)
[
t_entry.work_package.subject,
t_entry.work_package&.subject || "",
with_times_column && time_column.present? ? time_column : nil,
generator.format_hours(t_entry.hours),
t_entry.activity.name,
Expand Down
2 changes: 1 addition & 1 deletion modules/storages/config/locales/crowdin/js-de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ de:
open_storage: "Öffne %{storageType}"
select_location: "Speicherort auswählen"
choose_location: "Speicherort wählen"
new_folder: "New folder"
new_folder: "Neuer Ordner"
types:
nextcloud: "Nextcloud"
one_drive: "OneDrive/SharePoint"
Expand Down
Loading