Permalink
Browse files

Merged opf/openproject/refs/tags/v6.1.4 into opf/openproject-ce/relea…

…se/6.1
  • Loading branch information...
2 parents be6a1fe + 159e3de commit 2cb8b6310db134b34cf5213e36f9d9ebb05fd85c CI committed Jan 22, 2017
Showing with 261 additions and 209 deletions.
  1. +1 −1 .pkgr.yml
  2. +60 −73 CONTRIBUTING.md
  3. +21 −21 Gemfile.lock
  4. +2 −2 app/assets/stylesheets/_misc_legacy.sass
  5. +4 −0 app/assets/stylesheets/content/_attributes_table.sass
  6. +2 −5 app/assets/stylesheets/content/_tables.sass
  7. +1 −0 app/assets/stylesheets/content/_tabs.sass
  8. +1 −0 app/contracts/users/base_contract.rb
  9. +1 −1 app/controllers/api/experimental/concerns/v3_naming.rb
  10. +6 −3 app/helpers/queries_helper.rb
  11. +2 −0 app/helpers/search_helper.rb
  12. +1 −1 app/models/query.rb
  13. +1 −1 app/views/projects/form/_custom_fields.html.erb
  14. +4 −4 app/views/types/_form.html.erb
  15. +26 −18 doc/development/create-openproject-plugin.md
  16. +4 −4 doc/operation_guides/manual/installation-guide.md
  17. +2 −10 doc/operation_guides/packager/installation-guide.md
  18. +3 −3 doc/operation_guides/packager/upgrade-guide.md
  19. +6 −5 doc/operation_guides/system_requirements.md
  20. +48 −0 lib/api/utilities/property_name_converter_query_context.rb
  21. +1 −0 lib/api/v3/users/user_representer.rb
  22. +1 −1 lib/api/v3/work_packages/work_package_list_helpers.rb
  23. +5 −5 lib/generators/open_project/plugin/templates/%full_name%.gemspec.tt
  24. +2 −2 lib/generators/open_project/plugin/templates/lib/open_project/%plugin_name%/engine.rb.tt
  25. +1 −1 lib/open_project/version.rb
  26. +34 −12 spec/features/search_spec.rb
  27. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  28. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  29. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  30. +0 −12 vendored-plugins/openproject-costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
  31. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  32. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  33. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  34. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  35. +2 −7 vendored-plugins/openproject-meeting/features/meetings_new.feature
  36. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  37. +3 −1 vendored-plugins/openproject-my_project_page/app/helpers/my_projects_work_packages_helper.rb
  38. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  39. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  40. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  41. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  42. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  43. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  44. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  45. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -50,4 +50,4 @@ wizards:
- https://github.com/pkgr/addon-smtp.git
- https://github.com/pkgr/addon-memcached.git
- https://github.com/pkgr/addon-openproject.git
-buildpack: https://github.com/ddollar/heroku-buildpack-multi.git
+buildpack: https://github.com/opf/heroku-buildpack-multi.git
View
@@ -1,17 +1,51 @@
-OpenProject is an open source project and we encourage you to help us out.
-For contributing to OpenProject, please read the following guidelines.
+We are pleased that you are thinking about contributing to OpenProject! This guide details how to contribute to OpenProject in a way that is efficient and fun for everyone.
-*Please also note that these rules should be acknowledged by everyone,
-but repository contributors might occasionally deviate from them for practical purposes,
-e.g. not fork the repo, but have a branch on the main repository.
-This should however stay an exception.*
+### Get in touch
-## Contributors License Agreement
+Please get in touch with us using our [develompment forum](https://community.openproject.com/projects/openproject/boards/7) or send us an email to info@openproject.org.
+
+### Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people
+who contribute through reporting issues, posting feature requests,
+updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone,
+regardless of level of experience, gender, gender identity and expression, sexual orientation,
+disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language
+or imagery, derogatory comments or personal attacks, trolling, public or private harassment,
+insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
+code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
+Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported
+by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](http:contributor-covenant.org),
+version 1.0.0, available at
+[http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+
+
+### Issue tracking and coordination
+
+We use OpenProject for development coordination and roadmap planning. Please have a look at the following lists:
+
+- [development timeline](https://community.openproject.com/projects/openproject/timelines/36)
+- [product roadmap and release planning](https://community.openproject.com/projects/openproject/roadmap)
+- [wish list](https://community.openproject.com/versions/26)
+- [bug backlog](https://community.openproject.com/versions/136)
+
+### Branching model
+
+The main development branch for upcoming releases is `dev`.
+If in doubt, create your pull request against `dev`.
+All new features, gem updates and bugfixes for the upcoming release should go into the `dev` branch.
-External contributors have to sign a CLA before contributing to OpenProject.
-The [CLA can be found here](https://www.openproject.org/wp-content/uploads/2014/09/OPF-Contributor-License-Agreement_v.2.pdf)
-and has to be filled out and sent to cla@openproject.org.
-Additionally, a GPG signature has to be provided.
## Development flow
@@ -52,29 +86,21 @@ git push origin <your feature branch>
If your pull request **does not contain a description** for what it does and what it's intentions are,
we will reject it.
-If you are working on a specific work package from the [list](https://community.openproject.org/projects/openproject/work_packages?query_props=%7B%22c%22:%5B%22type%22,%22status%22,%22subject%22,%22assigned_to%22%5D,%22t%22:%22parent:desc%22,%22f%22:%5B%7B%22n%22:%22status_id%22,%22o%22:%22!%22,%22t%22:%22list_status%22,%22v%22:%5B%2217%22,%2223%22,%223%22,%2214%22,%226%22%5D%7D%5D,%22pa%22:1,%22pp%22:20%7D),
+If you are working on a specific work package from the [list](https://community.openproject.com/projects/openproject/work_packages),
you may include a link to that work package in the description, so we can track your work.
-We will then review your pull request.
+The core contributor team will then review your pull request according to our [code review guideline](https://www.openproject.org/open-source/development-free-project-management-software/code-review-guideliness/).
Please note that you can add commits after the pull request has been created by pushing
to the branch in your fork.
## Translations
-Beginning with OpenProject 4.2.0 the OpenProject core only holds the
-english locales and all other locales are stored in
-OpenProject-Translations. But since this plugin is hardwired in the
-Gemfile, german and other locales are available again.
-
If you want to contribute to the localization of OpenProject and its
plugins you can do so on [Crowdin](https://crowdin.com/projects/opf).
-Once a day we will fetch those locales and upload them to GitHub.
+Once a day we fetch those locales and upload them to GitHub.
-More on this topic can be found [in our blog](https://www.openproject.org/2015/07/10/help-translate-openproject-into-your-language/).
+More on this topic can be found in our [blog post](https://www.openproject.org/help-translate-openproject-into-your-language/).
-## Important notes
-
-To ensure a smooth workflow for everyone, please take note of the following:
### Testing
@@ -84,69 +110,30 @@ Pull requests will be verified by TravisCI as well,
but please run them locally as well and make sure they are green before creating your pull request.
We have a lot of pull requests coming in and it takes some time to run the complete suite for each one.
-### Branching model
+If you push to your branch in quick sucession, please consider stopping the associated Travis builds, as Travis will run for each commit. This is especially true if you force push to the branch.
+
+Please also use `[ci skip]` in your commit message to suppress builds which are not necessary
+(e.g. after fixing a typo in the `README`).
-The main development branch for upcoming releases is `dev`.
-If in doubt, create your pull request against `dev`.
-All new features, gem updates and bugfixes for the upcoming release should go into the `dev` branch.
#### Bugs and hotfixes
-Bugfixes for one of the actively supported versions of OpenProject
-should be issued against the respective branch.
-A fix for the current version (called "Hotfix" and the branch ideally being named `hotfix/XYZ`)
+Bugfixes for one of the actively supported versions of OpenProject should be issued against the respective branch.
+A fix for the current version (called "Hotfix" and the branch ideally being named `hotfix/XYZ`)
should target `release/*` and a fix for the former version
(called "Backport" and the branch ideally being named `backport/XYZ`)
should target `backport/*`. We will try to merge hotfixes into dev branch
but if that is no trivial task, we might ask you to create another PR for that.
-#### Travis CI
-
-If you push to your branch in quick sucession, please consider stopping the associated Travis builds,
-as Travis will run for each commit. This is especially true if you force push to the branch.
-
-Please also use `[ci skip]` in your commit message to suppress builds which are not necessary
-(e.g. after fixing a typo in the `README`).
### Inactive pull requests
We want to keep the Pull request list as cleaned up as possible - we will aim close pull requests
-after an **inactivity period of 72 hours** (no comments, no further pushes)
+after an **inactivity period of 30 days** (no comments, no further pushes)
which are not labelled as `work in progress` by us.
-### Issue tracking and coordination
-
-We use OpenProject for development coordination - please have a look at
-[the work packages list](https://community.openproject.org/projects/openproject/work_packages?query_props=%7B%22c%22:%5B%22type%22,%22status%22,%22subject%22,%22assigned_to%22%5D,%22t%22:%22parent:desc%22,%22f%22:%5B%7B%22n%22:%22status_id%22,%22o%22:%22!%22,%22t%22:%22list_status%22,%22v%22:%5B%2217%22,%2223%22,%223%22,%2214%22,%226%22%5D%7D%5D,%22pa%22:1,%22pp%22:20%7D)
-for upcoming features and reported bugs.
-
-### Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people
-who contribute through reporting issues, posting feature requests,
-updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone,
-regardless of level of experience, gender, gender identity and expression, sexual orientation,
-disability, personal appearance, body size, race, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language
-or imagery, derogatory comments or personal attacks, trolling, public or private harassment,
-insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
-code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
-Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported
-by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the
-[Contributor Covenant](http:contributor-covenant.org),
-version 1.0.0, available at
-[http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
-
-### Get in touch
+## Contributors License Agreement
-If you want to get in touch with us, there is also a
-[Gitter channel](https://gitter.im/opf/openproject) to talk to us directly.
+Contributors have to sign a CLA before contributing to OpenProject.
+The [CLA can be found here](https://www.openproject.org/wp-content/uploads/2015/08/Contributor-License-Agreement.pdf)
+and has to be filled out and sent to info@openproject.org.
View
@@ -94,10 +94,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 5ff2a6f1e733353bf558d72133f53187fccfc13c
+ revision: da52ff92cdcd62197b400bec93a1715cd685f092
branch: stable/6
specs:
- openproject-translations (6.1.3)
+ openproject-translations (6.1.4)
crowdin-api (~> 0.4.1)
mixlib-shellout (~> 2.1.0)
rails (~> 5.0.0)
@@ -132,67 +132,67 @@ GIT
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
- openproject-auth_plugins (6.1.3)
+ openproject-auth_plugins (6.1.4)
omniauth (~> 1.0)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (6.1.3)
+ openproject-backlogs (6.1.4)
acts_as_silent_list (~> 3.0.0)
- openproject-pdf_export (= 6.1.3)
+ openproject-pdf_export (= 6.1.4)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (6.1.3)
+ openproject-costs (6.1.4)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (6.1.3)
+ openproject-documents (6.1.4)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (6.1.3)
- openproject-webhooks (~> 6.1.3)
+ openproject-github_integration (6.1.4)
+ openproject-webhooks (~> 6.1.4)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (6.1.3)
+ openproject-global_roles (6.1.4)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (6.1.3)
+ openproject-local_avatars (6.1.4)
rails (~> 5.0)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (6.1.3)
+ openproject-meeting (6.1.4)
icalendar (~> 2.3.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (6.1.3)
+ openproject-my_project_page (6.1.4)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (6.1.3)
+ openproject-openid_connect (6.1.4)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 6.0)
@@ -201,42 +201,42 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (6.1.3)
+ openproject-pdf_export (6.1.4)
prawn (~> 2.1.0)
rails (~> 5.0.0)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (6.1.3)
+ openproject-reporting (6.1.4)
jquery-tablesorter (~> 1.22.3)
- openproject-costs (= 6.1.3)
+ openproject-costs (= 6.1.4)
rails (~> 5.0.0)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (6.1.3)
+ openproject-themes-dark (6.1.4)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (6.1.3)
+ openproject-webhooks (6.1.4)
rails (~> 5.0)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (6.1.3)
+ openproject-xls_export (6.1.4)
rails (~> 5.0.0)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (6.1.3)
+ reporting_engine (6.1.4)
json
rails (~> 5.0.0)
@@ -429,11 +429,11 @@ a.has-thumb
padding-left: 3px
-
/* Cut of text with '...' - working on all major browsers and IE6+
* not working for Firefox < 7 */
-.ellipsis
+.ellipsis,
+.form--field.ellipsis .form--label
white-space: nowrap
overflow: hidden
text-overflow: ellipsis
@@ -53,6 +53,10 @@
&.-hidden
display: none
+ &.-two-options
+ .attributes-table--option
+ width: 25%
+
.delete-item
cursor: pointer
float: right
@@ -97,11 +97,8 @@ table
white-space: nowrap
transform: rotate(270deg)
position: absolute
- top: 130px
- left: -40px
- transform-origin: center center
- margin-top: 8px
- font-size: 0.875rem
+ top: 235px
+ transform-origin: 0 0
text-transform: uppercase
font-weight: bold
@@ -75,6 +75,7 @@
#content .tab-content
overflow-x: auto
+ overflow-y: hidden
div.tabs-buttons
position: absolute
@@ -37,6 +37,7 @@ class BaseContract < ::ModelContract
attribute :lastname
attribute :name
attribute :mail
+ attribute :admin
attribute :auth_source_id
attribute :identity_url
@@ -92,6 +92,6 @@ def json_query_as_v3(json_query)
def context_dummy
# memorize the work package because
# initializing a work package queries the db
- @context_dummy ||= WorkPackage.new
+ @context_dummy ||= API::Utilities::PropertyNameConverterQueryContext.new
end
end
Oops, something went wrong.

0 comments on commit 2cb8b63

Please sign in to comment.