Skip to content

Commit

Permalink
Merge branch 'release/11.0' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ulferts committed Oct 26, 2020
2 parents 37c4bce + 21d4c8d commit 6f6096f
Show file tree
Hide file tree
Showing 33 changed files with 442 additions and 467 deletions.
271 changes: 49 additions & 222 deletions app/models/work_packages/scopes/for_scheduling.rb

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions config/initializers/inflections.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

# These inflection rules are supported but not enabled by default:
ActiveSupport::Inflector.inflections(:en) do |inflect|
inflect.acronym "API"
inflect.acronym 'OAuth'
inflect.acronym 'OpenID'
end
65 changes: 32 additions & 33 deletions config/locales/crowdin/ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ja:
is_active: 現在表示されています
is_inactive: 現在表示されていません
attribute_help_texts:
note_public: 'Any text and images you add to this field is publically visible to all logged in users!'
note_public: 'このフィールドに追加したテキストと画像は全てのログインユーザーに公開されます!'
text_overview: 'このビューは、属性表示のカスタム ヘルプ テキストを作成できます。定義すると、このテキストはその属性の横にあるヘルプ アイコンをクリックして表示できます。'
label_plural: '属性のヘルプ テキスト'
show_preview: 'テキストをプレビュー'
Expand All @@ -90,8 +90,8 @@ ja:
no_results_content_text: 新しい認証モードを作成
background_jobs:
status:
error_requeue: "Job experienced an error but is retrying. The error was: %{message}"
cancelled_due_to: "Job was cancelled due to error: %{message}"
error_requeue: "ジョブにエラーが発生しましたが、再試行中です。エラー: %{message}"
cancelled_due_to: "エラーが発生したため、ジョブはキャンセルされました。エラー: %{message}"
ldap_auth_sources:
technical_warning_html: |
この LDAP フォームには、LDAP / Active Directory の設定に関する技術的な知識が必要です。
Expand Down Expand Up @@ -131,8 +131,7 @@ ja:
ldap_details: 'LDAPに関する詳細'
user_settings: '属性のマッピング'
user_settings_legend: |
The following fields are related to how users are created in OpenProject from LDAP entries and
what LDAP attributes are used to define the attributes of an OpenProject user (attribute mapping).
以下のフィールドは、LDAPエントリからOpenProjectのユーザーの作成方法とアトリビュートマッピングに関連しています。
tls_mode:
plain: 'なし'
simple_tls: 'simple_tls'
Expand Down Expand Up @@ -200,9 +199,9 @@ ja:
completed: "プロジェクト%{name} の削除が完了しました"
completed_text: "プロジェクト '%{name}'を削除要求は完了しました。"
index:
edit_columns: 'Edit columns'
open_as_gantt: 'Open as Gantt view'
open_as_gantt_title: "Use this button to generate a Gantt view that filters work packages for the projects visible on this page."
edit_columns: '列の編集'
open_as_gantt: 'ガントビューとして開く'
open_as_gantt_title: "このボタンを使用して、このページに表示されているプロジェクトのワークパッケージをフィルタリングするガントビューを生成します。"
open_as_gantt_title_admin: "You can modify the view settings (such as selected work package types) in the administration under project settings."
no_results_title_text: 現在、プロジェクトはありません
no_results_content_text: プロジェクトを新規作成
Expand Down Expand Up @@ -417,7 +416,7 @@ ja:
types: "作業項目の型"
versions: "バージョン"
work_packages: "作業項目"
templated: 'Template project'
templated: 'テンプレートプロジェクト'
projects/status:
code: 'ステータス'
explanation: '状況の説明'
Expand Down Expand Up @@ -518,7 +517,7 @@ ja:
could_not_be_copied: "%{dependency} could not be (fully) copied."
does_not_exist: "は存在しません。"
error_unauthorized: "アクセスできません。"
error_readonly: "was attempted to be written but is not writable."
error_readonly: "書けませんでした。"
empty: "は空にすることができません。"
even: "は偶数にしてください。"
exclusion: "は予約されています。"
Expand Down Expand Up @@ -636,7 +635,7 @@ ja:
time_entry:
attributes:
hours:
day_limit: "is too high as a maximum of 24 hours can be logged per date."
day_limit: "1日あたり最大24時間まで記録できます。"
work_package:
is_not_a_valid_target_for_time_entries: "作業時間を再割り当てるには、作業項目#%{id}は対象外である。"
attributes:
Expand Down Expand Up @@ -788,7 +787,7 @@ ja:
type: "種別"
updated_at: "更新日時"
updated_on: "更新日時"
uploader: "Uploader"
uploader: "アップロード"
user: "ユーザ"
version: "バージョン"
work_package: "ワーク パッケージ"
Expand Down Expand Up @@ -904,7 +903,7 @@ ja:
- "10月"
- "11月"
- "12月"
abbr_week: 'Wk'
abbr_week: ''
day_names:
- "日曜日"
- "月曜日"
Expand Down Expand Up @@ -1061,7 +1060,7 @@ ja:
rename_groups: "属性グループの名前を変更"
project_filters:
description_html: "カスタムフィールドのフィルタリングと並べ替えは、エンタープライズ版の機能です。"
enumeration_activities: "Time tracking activities"
enumeration_activities: "タイムトラッキングアクティビティ"
enumeration_work_package_priorities: "作業項目の優先度"
enumeration_reported_project_statuses: "報告されるプロジェクト進捗状況"
error_auth_source_sso_failed: "ユーザー '%{value}' のシングルサインオン (SSO) に失敗しました"
Expand Down Expand Up @@ -1134,7 +1133,7 @@ ja:
pdf_with_descriptions_and_attachments: "説明と添付ファイル付きPDF"
pdf_with_attachments: "添付ファイル付きPDF"
image:
omitted: "Image not exported."
omitted: "画像はエクスポートされませんでした。"
extraction:
available:
pdftotext: "Pdftotextが利用可能 (オプション)"
Expand Down Expand Up @@ -1713,16 +1712,16 @@ ja:
label_workflow_plural: "ワークフロー"
label_workflow_summary: "サマリー"
label_x_closed_work_packages_abbr:
zero: "0 closed"
zero: "0 クローズ"
other: "%{count}件完了"
label_x_comments:
zero: "no comments"
zero: "コメントがありません"
other: "%{count}件コメント"
label_x_open_work_packages_abbr:
zero: "0 open"
zero: "0 オープン"
other: "%{count}件未完了"
label_x_projects:
zero: "no projects"
zero: "プロジェクトがありません"
other: "%{count}件プロジェクト"
label_yesterday: "昨日"
auth_source:
Expand Down Expand Up @@ -1955,12 +1954,12 @@ ja:
template:
copying: >
Your project is being created from the selected template project. You will be notified by mail as soon as the project is available.
use_template: 'Use template'
use_template: 'テンプレートを使用'
make_template: 'Set as template'
remove_from_templates: 'Remove from templates'
archive:
are_you_sure: "プロジェクト '%{name}' をアーカイブしてもよろしいですか?"
archived: "Archived"
archived: "アーカイブ済み"
project_module_activity: "活動"
project_module_forums: "フォーラム"
project_module_calendar: "カレンダー"
Expand All @@ -1978,7 +1977,7 @@ ja:
member_of_group: "担当者のグループ"
assignee_or_group: "割り当てまたは所属するグループ"
subproject_id: "Including Subproject"
only_subproject_id: "Only subproject"
only_subproject_id: "サブプロジェクトのみ"
name_or_identifier: "名前または ID"
repositories:
at_identifier: '%{identifier} で'
Expand Down Expand Up @@ -2084,10 +2083,10 @@ ja:
warnings:
cannot_annotate: "このファイルに注釈を付けることはできません。"
scheduling:
activated: 'activated'
deactivated: 'deactivated'
activated: '有効化'
deactivated: '無効化'
search_input_placeholder: "検索…"
setting_apiv3_cors_enabled: "Enable CORS"
setting_apiv3_cors_enabled: "CORSを有効にする"
setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins"
setting_apiv3_cors_origins_text_html: >
If CORS is enabled, these are the origins that are allowed to access OpenProject API. <br/> Please check the <a href="%{origin_link}" target="_blank">Documentation on the Origin header</a> on how to specify the expected values.
Expand Down Expand Up @@ -2207,7 +2206,7 @@ ja:
session: "セッション"
brute_force_prevention: "自動的にユーザをロック"
projects:
section_new_projects: "Settings for new projects"
section_new_projects: "新規プロジェクトの設定"
section_project_overview: "Settings for project overview list"
user:
default_preferences: "デフォルト設定"
Expand Down Expand Up @@ -2263,7 +2262,7 @@ ja:
text_destroy_with_associated: "削除される仕事項目と追加の対象物が関連付けています。それらの対象物は次の種類です:"
text_destroy_what_to_do: "どれかを選択して下さい。"
text_diff_truncated: "... 差分の行数が表示可能な上限を超えました。超過分は表示しません。"
text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server to enable them."
text_email_delivery_not_configured: "メール配信が設定されておらず、通知が無効になっています。\nSMTPサーバーを有効にしてください。"
text_enumeration_category_reassign_to: "次の値に割り当て直す:"
text_enumeration_destroy_question: "%{count}件のオブジェクトがこの値に割り当てられています。"
text_file_repository_writable: "添付ファイルのディレクトリが書き込み可能"
Expand All @@ -2276,8 +2275,8 @@ ja:
text_work_package_category_destroy_question: "%{count}件の作業項目がこのカテゴリに割り当てられています。よろしいですか?"
text_work_package_category_reassign_to: "作業項目をこのカテゴリに再割り当てする"
text_work_package_updated: "作業項目%{id}が%{author}によって更新されました。"
text_work_package_watcher_added: "You have been added as a watcher to Work package %{id} by %{watcher_changer}."
text_work_package_watcher_removed: "You have been removed from watchers of Work package %{id} by %{watcher_changer}."
text_work_package_watcher_added: "あなたは %{watcher_changer}によってワークパッケージ%{id} のウォッチャーとして追加されました。"
text_work_package_watcher_removed: "あなたは %{watcher_changer}によってワークパッケージ%{id} のウォッチャーとして追加されました。"
text_work_packages_destroy_confirmation: "選択した作業項目を削除してもよろしいですか?"
text_work_packages_ref_in_commit_messages: "コミットメッセージ内で作業項目の参照/修正"
text_journal_added: "%{label}で%{value}を追加"
Expand Down Expand Up @@ -2561,7 +2560,7 @@ ja:
warning_bar:
protocol_mismatch:
title: 'Protocol setting mismatch'
title: 'プロトコル設定が一致しません'
text_html: >
Your application is running with its protocol setting set to <code>%{set_protocol}</code>, but the request is an <code>%{actual_protocol}</code> request. This will result in errors! Go to <a href="%{setting_path}">System settings</a> and change the "Protocol" setting to correct this.
hostname_mismatch:
Expand Down Expand Up @@ -2629,8 +2628,8 @@ ja:
doorkeeper:
pre_authorization:
status: '事前承認'
auth_url: 'Auth URL'
access_token_url: 'Access token URL'
auth_url: '認証URL'
access_token_url: 'アクセストークン'
errors:
messages:
#Common error messages
Expand Down Expand Up @@ -2688,7 +2687,7 @@ ja:
wants_to_access_html: >
このアプリケーションはあなたのOpenProjectアカウントへのアクセスを要求します。 <br/> <strong>次の権限が要求されています:</strong>
scopes:
api_v3: "Full API v3 access"
api_v3: "Full API v3アクセス"
api_v3_text: "Application will receive full read & write access to the OpenProject API v3 to perform actions on your behalf."
grants:
created_date: "に承認済み"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/crowdin/js-ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ ja:
label_and: "及び"
label_ascending: "昇順"
label_author: "作者: %{user}"
label_avatar: "Avatar"
label_avatar: "アバター"
label_between: "次の範囲内"
label_board: "ボード"
label_board_locked: "ロックされている"
Expand Down
2 changes: 1 addition & 1 deletion docker/setup/preinstall-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tmpdir=$(mktemp -d)
cd $tmpdir

# Install XKT converter
npm install xeokit/xeokit-gltf-to-xkt -g
npm install @xeokit/xeokit-gltf-to-xkt@0.0.3 -g

# Install COLLADA2GLTF
wget --quiet https://github.com/KhronosGroup/COLLADA2GLTF/releases/download/v2.1.5/COLLADA2GLTF-v2.1.5-linux.zip
Expand Down
6 changes: 3 additions & 3 deletions docs/enterprise-edition-guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ The Enterprise Edition builds on top of the free Community Edition. An upgrade i

| Popular Topics | Description |
| ------------------------------------------------------------ | :----------------------------------------------------------- |
| [Enterprise Edition trial](/enterprise-trial) | Can I test the Enterprise Edition for free? |
| [Activate the Enterprise Edition](/activate-enterprise-edition) | How can I upgrade my Community Edition to an Enterprise Edition? |
| [Installation support](/support) | How can I get installation support? |
| [Enterprise Edition trial](enterprise-trial/) | Can I test the Enterprise Edition for free? |
| [Activate the Enterprise Edition](activate-enterprise-edition/) | How can I upgrade my Community Edition to an Enterprise Edition? |
| [Installation support](support) | How can I get installation support? |

<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/YRF_bavXBts" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ you will need to adjust that package source.
- Update the reference to `stable/8` in `/etc/zypp/repos.d/openproject.repo` to `stable/9`.
- Perform the Upgrade steps as mentioned above in *Upgrading your OpenProject installation*

### Upgrade notes for OpenProject 7.x to 8.x
## Upgrade notes for OpenProject 7.x to 8.x

These following points are some known issues around the update to 8.0. It does not contain the entire list of changes. To see all changes, [please browse the release notes](https://docs.openproject.org/release-notes/8-0-0/).

#### Upgrades in NPM may result in package inconsistencies
### Upgrades in NPM may result in package inconsistencies

As has been reported from the community, [there appear to be issues with NPM leftover packages](https://community.openproject.com/projects/openproject/work_packages/28571) upgrading to OpenProject 8.0.0. This is due to the packages applying a delta between your installed version and the to-be-installed 8.0. package. In some cases such as SLES12 and Centos 7, the `frontend/node_modules` folder is not fully correctly replaced. This appears to hint at an issue with yum, the package manager behind both.

Expand All @@ -179,7 +179,7 @@ rm -rf /opt/openproject/frontend/node_modules
# Continue with the installation steps described below
```

#### Migration from Textile to Markdown
### Migration from Textile to Markdown

OpenProject 8.0. has removed Textile, all previous content is migrated to GFM Markdown using [pandoc](https://pandoc.org). This will happen automatically during the migration run. A recent pandoc version will be downloaded by OpenProject.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The [docker-based installation](../installation/docker) requires a system with D

Both the package and docker based installations will install and setup the following dependencies that are required by OpenProject to run:

* __Runtime:__ [Ruby](https://www.ruby-lang.org/en/) Version = 2.6.x
* __Runtime:__ [Ruby](https://www.ruby-lang.org/en/) Version = 2.7.x
* __Webserver:__ [Apache](http://httpd.apache.org/)
or [nginx](http://nginx.org/en/docs/)
* __Application server:__ [Puma](https://puma.io/)
Expand All @@ -48,7 +48,7 @@ Both the package and docker based installations will install and setup the follo

OpenProject supports the latest versions of the major browsers.

* [Mozilla Firefox](https://www.mozilla.org/en-US/firefox/products/) (at least ESR version 68.6.0)
* [Mozilla Firefox](https://www.mozilla.org/en-US/firefox/products/) (at least ESR version 78.3.1)
* [Microsoft Edge](https://www.microsoft.com/de-de/windows/microsoft-edge)
* [Google Chrome](https://www.google.com/chrome/browser/desktop/)
* [Apple Safari](https://www.apple.com/safari/)
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/forums/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ In the forum in OpenProject you can discuss topics in a project with the team: p
<div class="glossary"> **Forum** is defined as a module used to display forums and forum entries. The module has to be activated in the project settings and a forum has to be created in the forums tab in the project settings to be displayed in the side navigation.
</div>

| Topic | Content |
| Topic | Content |
| -------------------------------------------------------- | ------------------------------------------------------------ |
| [Open a forum](#open-a-forum) | How to open an existing forum? |
| [Create a new message](#create-a-new-message-in-a-forum) | How to create a new message in a forum? |
Expand Down
Loading

0 comments on commit 6f6096f

Please sign in to comment.