Merge branch 'release/10.2' into dev

5 years ago · d44416ee84
parent 0c32642ff6 2f624ed337
commit d44416ee84
15 changed files with 38 additions and 32 deletions
--- a/README.md
+++ b/README.md
@ -10,9 +10,9 @@ OpenProject is a web-based project management software. Its key features are:
 * [Agile and Scrum](https://www.openproject.org/collaboration-software-features/#agile-scrum)
 * [Time tracking, cost reporting and budgeting](https://www.openproject.org/collaboration-software-features/#time-tracking)
 * [Bug tracking](https://www.openproject.org/collaboration-software-features/#bug-tracking)
-* [Wikis](https://www.openproject.org/help/wiki/)
-* [Forums](https://www.openproject.org/help/user-guides/forum/)
-* [Meeting agendas and meeting minutes](https://www.openproject.org/help/meetings/)
+* [Wikis](https://docs.openproject.org/user-guide/wiki/)
+* [Forums](https://docs.openproject.org/user-guide/forum/)
+* [Meeting agendas and meeting minutes](https://docs.openproject.org/user-guide/meetings/)

 More information and screenshots can be found on our [website](https://www.openproject.org).

--- a/app/assets/stylesheets/content/_autocomplete.sass
+++ b/app/assets/stylesheets/content/_autocomplete.sass
@ -175,6 +175,9 @@ mark.ui-autocomplete-match
  height: initial !important
  min-height: initial !important

+  .wp-table--cell-container & .ng-value-label
+    display: initial !important
+
 // Ensure dropdown is above modals
 .ng-dropdown-panel
  z-index: 9500 !important
--- a/app/assets/stylesheets/content/work_packages/inplace_editing/_display_fields.sass
+++ b/app/assets/stylesheets/content/work_packages/inplace_editing/_display_fields.sass
@ -45,8 +45,11 @@

  // Always render custom options as inline
  // when only one line
-  .custom-option:not(.-multiple-lines)
-    display: inline
+  .custom-option
+    @include text-shortener
+    white-space: normal
+    &:not(.-multiple-lines)
+      display: inline

  &.split-time-field
    white-space: nowrap
--- a/app/helpers/open_project_error_helper.rb
+++ b/app/helpers/open_project_error_helper.rb
@ -26,11 +26,11 @@ module OpenProjectErrorHelper

  def op_logging_context
    {
-      current_user: current_user,
+      current_user: User.current,
      params: params,
      request: try(:request),
      session: try(:session),
-      env: try(:env),
+      env: try(:env)
    }
  end
 end
--- a/config/locales/en.seeders.standard.yml
+++ b/config/locales/en.seeders.standard.yml
@ -153,7 +153,7 @@ en:
                      ![new project](##attachment:"new_project.jpg")

                      **Find out more:**
-                      * https://www.openproject.org/help/administration/manage-projects/
+                      * https://docs.openproject.org/system-admin-guide/manage-projects/
                    status: :default_status_in_progress
                    type: :default_type_task
                    start: 0
@ -175,7 +175,7 @@ en:
                      ![project overview](##attachment:"project_overview.jpg")

                      **Find out more:**
-                      * https://www.openproject.org/help/project-setup/
+                      * https://docs.openproject.org/user-guide/project-overview/
                    status: :default_status_in_progress
                    type: :default_type_task
                    start: 0
@ -217,7 +217,7 @@ en:
                      ![project members](##attachment:"project_members.jpg")

                      **Find out more:**
-                      * https://www.openproject.org/help/add-project-members/
+                      * https://docs.openproject.org/user-guide/members/
                    status: :default_status_new
                    type: :default_type_task
                    start: 1
@ -240,7 +240,7 @@ en:
                      ![create work package](##attachment:"create_work_package.jpg")

                      **Find out more**:
-                      * https://www.openproject.org/help/work-packages/create-new-work-package/
+                      * https://docs.openproject.org/user-guide/work-packages/create-work-package/
                    status: :default_status_in_progress
                    type: :default_type_task
                    start: 1
@ -263,7 +263,7 @@ en:
                      ![gantt chart](##attachment:"gantt_chart.jpg")

                      **Find out more:**
-                      * https://www.openproject.org/help/timelines/integrated-timeline-work-package-page/
+                      * https://docs.openproject.org/user-guide/gantt-chart/
                    status: :default_status_new
                    type: :default_type_task
                    start: 2
@ -288,7 +288,7 @@ en:
                      ![edit work package](##attachment:"edit_work_package.jpg")

                      **Find out more**:
-                      * https://www.openproject.org/help/work-packages/
+                      * https://docs.openproject.org/user-guide/work-packages/
                    status: :default_status_new
                    type: :default_type_task
                    start: 3
@ -377,7 +377,7 @@ en:
                  *   view as Mardown.

                  **More information:**
-                  https://www.openproject.org/help/wiki/
+                  https://docs.openproject.org/user-guide/wiki/
                children:
                  - title: Project documentation
                    content: |
--- a/docs/README.md
+++ b/docs/README.md
@ -24,7 +24,7 @@ The guides for [manual](./operations/upgrading/manual/upgrading.md), [packaged](

 ## User Guides

-Please see our [User Guide pages](https://www.openproject.org/help/user-guides/) for detailed documentation on the functionality of OpenProject.
+Please see our [User Guide pages](https://docs.openproject.org/user-guide/) for detailed documentation on the functionality of OpenProject.


 ## Development
--- a/docs/installation/packaged/2-configuration.md
+++ b/docs/installation/packaged/2-configuration.md
@ -139,7 +139,7 @@ In that case, you will be shown three additional dialogs to enter the certificat

 If you have selected to auto-install an Apache2 web server, you will be asked whether you want to install Git and Subversion repository support. In case you do not need it or when in doubt, choose **Skip** for both options.

-For more information, [see our help on repositories](https://www.openproject.org/help/repository/)
+For more information, [see our help on repositories](https://docs.openproject.org/user-guide/repository/)

 ![03-repos](https://github.com/opf/openproject/blob/dev/docs/installation/packaged/screenshots/03-repos.png?raw=true)

--- a/docs/operations/upgrading/manual/upgrading.md
+++ b/docs/operations/upgrading/manual/upgrading.md
@ -331,4 +331,4 @@ run:
 ## 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.

-Also, please take a look at the Frequently [Asked Questions](https://www.openproject.org/help/faq/).
+Also, please take a look at the Frequently [Asked Questions](https://docs.openproject.org/installation-and-operations/operation/faq/).
--- a/docs/user/textile-to-markdown-migration/README.md
+++ b/docs/user/textile-to-markdown-migration/README.md
@ -51,7 +51,7 @@ With the migration of Markdown, we have introduced a quasi-WYSIWYG powerd by CKE



-For information regarding the features of Markdown and the capabilities of the CKEditor WYSIWYG editor built upon it, please see https://www.openproject.org/help/wiki/.
+For information regarding the features of Markdown and the capabilities of the CKEditor WYSIWYG editor built upon it, please see https://docs.openproject.org/user-guide/wiki/.



--- a/frontend/src/app/modules/common/autocomplete/user-autocompleter.component.ts
+++ b/frontend/src/app/modules/common/autocomplete/user-autocompleter.component.ts
@ -52,7 +52,7 @@ import {HalResource} from "core-app/modules/hal/resources/hal-resource";
               (focus)="onFocus()"
               (change)="onModelChange($event)">
      <ng-template ng-option-tmp let-item="item" let-index="index">
-        <user-avatar *ngIf="item"
+        <user-avatar *ngIf="item && item.id"
                     [user]="item"
                     data-class-list="avatar-mini">
        </user-avatar>
--- a/help/user-guide/agile-boards/README.md
+++ b/help/user-guide/agile-boards/README.md
@ -84,7 +84,7 @@ To remove lists, click on the three dots next to a list's title, and select **De

 ## Add cards to a list

-You can add cards to a list. Cards represent a [work package](https://www.openproject.org/help/work-packages/) in OpenProject. They can be any kind of work within a project, e.g. a Task, a Bug, a Feature, a Risk, anything.
+You can add cards to a list. Cards represent a [work package](https://docs.openproject.org/user-guide/work-packages/) in OpenProject. They can be any kind of work within a project, e.g. a Task, a Bug, a Feature, a Risk, anything.

 ![OpenProject-Boards_cards](OpenProject-Boards_cards-1568639967764.png) 

--- a/lib/open_project/static/links.rb
+++ b/lib/open_project/static/links.rb
@ -79,7 +79,7 @@ module OpenProject
              label: 'homescreen.links.upgrade_enterprise_edition'
            },
            user_guides: {
-              href: 'https://www.openproject.org/help/',
+              href: 'https://docs.openproject.org/user-guide/',
              label: 'homescreen.links.user_guides'
            },
            upgrade_guides: {
@ -147,7 +147,7 @@ module OpenProject
              label: :label_api_documentation
            },
            text_formatting: {
-              href: 'https://www.openproject.org/help/wiki/',
+              href: 'https://docs.openproject.org/user-guide/wiki/',
              label: :setting_text_formatting
            },
            oauth_authorization_code_flow: {
--- a/modules/ldap_groups/config/locales/crowdin/pt-BR.yml
+++ b/modules/ldap_groups/config/locales/crowdin/pt-BR.yml
@ -22,11 +22,11 @@ pt-BR:
        info: "Nota: O próprio grupo OpenProject e membros adicionados fora desta sincronização LDAP não serão removidos."
        verification: "Digite o nome do grupo %{name} para verificar a exclusão."
      help_text_html: |
-        This module allows you to set up a synchronization between LDAP and OpenProject groups.
-        It depends on LDAP groups need to use the <em>groupOfNames / memberOf</em> attribute set to be working with OpenProject.
+        Este módulo permite que você configure uma sincronização entre os grupos LDAP e OpenProject.
+        Depende dos grupos LDAP que precisam usar o atributo <em>groupOfNames / memberOf</em> para trabalhar com o OpenProject.
        <br/>
-        Groups are synchronized hourly through a cron job.
-        <a href="https://www.openproject.org/help/administration/manage-ldap-authentication/">Please see our documentation on this topic</a>.
+        Os grupos são sincronizados de hora em hora através de um cron job.
+        <a href="https://www.openproject.org/help/administration/manage-ldap-authentication/">Por favor veja nossa documentação sobre este tópico</a>.
      no_results: 'Nenhum grupo sincronizado encontrado.'
      no_members: 'Este grupo ainda não tem membros sincronizados.'
      plural: 'Grupos LDAP sincronizados'
--- a/modules/overviews/config/locales/en.seeders.bim.yml
+++ b/modules/overviews/config/locales/en.seeders.bim.yml
@ -70,7 +70,7 @@ en:
                      6.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages](%{base_url}/projects/demo-construction-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
                      7.  _Agile working? Check out our brand new boards:_ → Go to [Boards](%{base_url}/projects/demo-construction-project/boards)

-                      Here you will find our [User Guides](https://www.openproject.org/help/).
+                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
                      Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                - identifier: 'project_status'
                  start_row: 2
@ -135,7 +135,7 @@ en:
                      5.  _Activate further modules:_ → Go to [Project settings → Modules](%{base_url}/projects/demo-planning-constructing-project/settings/modules).
                      6.  _Working agile? Create a new board:_ → Go to [Boards](%{base_url}/projects/demo-planning-constructing-project/boards)

-                      Here you will find our [User Guides](https://www.openproject.org/help/).
+                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
                      Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                - identifier: 'project_status'
                  start_row: 2
@ -201,7 +201,7 @@ en:
                      6.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages](%{base_url}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
                      7.  _Working agile? Create a new board:_ → Go to [Boards](%{base_url}/projects/demo-bim-project/boards)

-                      Here you will find our [User Guides](https://www.openproject.org/help/).
+                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
                      Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                - identifier: 'project_status'
                  start_row: 2
@ -266,7 +266,7 @@ en:
                      5.  _Activate further modules:_ → Go to [Project settings → Modules.](%{base_url}/projects/demo-bcf-management-project/settings/modules)
                      6.  _You love the agile approach? Create a board:_ → Go to [Boards](%{base_url}/projects/demo-bcf-management-project/boards).

-                      Here you will find our [User Guides](https://www.openproject.org/help/).
+                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
                      Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                - identifier: 'project_status'
                  start_row: 2
--- a/modules/overviews/config/locales/en.seeders.standard.yml
+++ b/modules/overviews/config/locales/en.seeders.standard.yml
@ -66,7 +66,7 @@ en:
                      5. *Activate further modules*: &rightarrow; Go to [Project settings &rightarrow; Modules](%{base_url}/projects/demo-project/settings/modules).
                      6. *Complete your tasks in the project*: &rightarrow; Go to [Work packages &rightarrow; Tasks](%{base_url}/projects/demo-project/work_packages/details/##wp.id:"Edit a work package"/overview?query_id=##query.id:"Tasks").

-                      Here you will find our [User Guides](https://www.openproject.org/help/).
+                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
                      Please let us know if you have any questions or need support. Contact us: [support[at]openproject.com](mailto:support@openproject.com).
                - identifier: 'project_status'
                  start_row: 2
@ -132,7 +132,7 @@ en:
                      6. *Create a Sprint wiki*: &rightarrow; Go to [Backlogs](%{base_url}/projects/your-scrum-project/backlogs) and open the sprint wiki from the right drop down menu in a sprint. You can edit the [wiki template](%{base_url}/projects/your-scrum-project/wiki/) based on your needs.
                      7. *Activate further modules*: &rightarrow; Go to [Project settings &rightarrow; Modules](%{base_url}/projects/your-scrum-project/settings/modules).

-                      Here you will find our [User Guides](https://www.openproject.org/help/).
+                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
                      Please let us know if you have any questions or need support. Contact us: [support[at]openproject.com](mailto:support@openproject.com).
                - identifier: 'project_status'
                  start_row: 2