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

[ci skip]
pull/8574/head
Oliver Günther 4 years ago
commit db3ff83e1d
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
  1. 6
      docs/system-admin-guide/authentication/openid-providers/README.md
  2. 29
      docs/system-admin-guide/authentication/saml/README.md
  3. 4
      docs/system-admin-guide/manage-work-packages/work-package-types/README.md
  4. 7
      docs/user-guide/time-and-costs/README.md

@ -8,10 +8,6 @@ keywords: OpenID providers
---
# OpenID providers
<div class="alert alert-info" role="alert">
**Note**: For the OpenID configuration view our docs in Github: https://github.com/opf/openproject/blob/dev/docs/configuration/openid.md (Todo: needs to be moved to documentation).
</div>
To activate and configure OpenID providers in OpenProject, navigate to -> *Administration* -> *Authentication* and choose -> *OpenID providers*.
## Add a new authentication application for oauth
@ -107,4 +103,4 @@ sudo openproject run console
> exit
```
Then, existing users should be able to log in using their Azure identity. Note that this works only if the user is using password-based authentication, and is not linked to any other authentication source (e.g. LDAP) or OpenID provider.
Then, existing users should be able to log in using their Azure identity. Note that this works only if the user is using password-based authentication, and is not linked to any other authentication source (e.g. LDAP) or OpenID provider.

@ -99,7 +99,36 @@ OPENPROJECT_SAML_MY__SAML_ATTRIBUTE__STATEMENTS_ADMIN="['openproject-isadmin']"
Please note that every underscore (`_`) in the original configuration key has to be replaced by a duplicate underscore
(`__`) in the environment variable as the single underscore denotes namespaces. For more information, follow our [guide on environment variables](https://docs.openproject.org/installation-and-operations/configuration/environment/).
#### 1.3 Settings in database
The SAML settings can also be changed at runtime in the database through the OpenProject settings.
As opposed to other settings there is no user interface for this.
That means it's best to set them using the console.
```
# package based installation:
> sudo openproject run console
# docker-based installation:
> docker exec -it openproject bash
>> bundle exec rails console
```
Once on the console you can set the same values as named in the `configuration.yml` file.
For example:
```ruby
Setting.plugin_openproject_auth_saml = Hash(Setting.plugin_openproject_auth_saml).deep_merge({
"providers" => {
"my_saml" => {
"name" => "saml",
"display_name" => "My SSO",
"assertion_consumer_service_url" => "https:/<YOUR OPENPROJECT HOSTNAME>/auth/saml/callback"
# etc.
}
}
})
```
### 2. Configuration details

@ -38,7 +38,7 @@ Click the green **+ Type** button to add a new work package type in the system,
## Work package form configuration
You can freely **configure the attributes shown** for each work package type to decide which attributes are shown in the from and how they are grouped.
You can freely **configure the attributes shown** for each work package type to decide which attributes are shown in the form and how they are grouped.
To configure a type, first select the type from the list of types (see above) and select the tab ***Form configuration*** *(1)*.
@ -84,4 +84,4 @@ Under -> *Administration* -> *Work packages* -> *Types* on the tab **Projects**
The **Activated for new projects by default** setting in the Types will only activate this type for new projects. For existing projects, the type needs to be activated manually.
This can be also configured in the [project settings](../../../user-guide/projects/project-settings).
![activate projects for work package types](image-20200116150513323.png)
![activate projects for work package types](image-20200116150513323.png)

@ -21,12 +21,11 @@ Create budgets, log time and costs on specific work packages and create time an
| [Cost tracking](cost-tracking) | How to track unit costs spent in a project? |
| [Time and cost reporting](reporting) | How to create time and cost reports? |
## Time tracking, budgets and cost report video tutorial
## Time tracking, cost tracking and reporting video tutorial
Watch this short video to get a first overview about time and cost reporting and budgets in OpenProject.
<iframe width="560" height="315" src="https://www.youtube.com/embed/CU0pcDQvZuM" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
Watch this short video to get a first overview about time and cost reporting in OpenProject.
<iframe width="560" height="315" src="https://www.youtube.com/embed/2B_CXZRsZxI" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
## Frequently asked questions (FAQ)
### Does OpenProject provide resource management?

Loading…
Cancel
Save